service cleanup
Merge pull request #346 from bcoca/service_cleanup

service cleanup