Clean step (18/27)

Clean step