cleanup and remove unused steps

@kevgo