Removing unneeded steps