Remove unneeded steps