Clean up GeneratorServiceCommand & ServiceGenerator classes