Removing un-needed steps