Get rid of unused CleanUp in steps. [#82750054]

Signed-off-by: Amit Gupta <agupta@pivotal.io>