Made some clean up stages