Reduced mock data clutter
Reduced use of Mocks.groovy
Removed unused ConfigService method
Merge pull request #473 from joesondow/clean-up

Clean up