removed unused steps
some more fixes