Services get cleaned up after they are deleted
Merge pull request #1152 from control-center/feature/cc-257

Services get cleaned up after they are deleted