enabled removal of a service after saving the application
Merge branch 'working'