Change more classes to use ServiceRemoveStepHandler