cleanup in generator command command
remove services in test
Merge pull request #102 from dmouse/command-cleanup

Command cleanup