Let cleanup steps hold their own data

Let cleanup steps hold their own data #8172