update cleanup to work with new pipeline libs

Change-Id: If4a21bfe8908d028282e09e6ef0dda70609253d0
1 file changed