Make basic removal of services work.
Service failure handling