Removing some steps