Removal of unused steps