Clean up of feature steps