[Work in progress - Make basic removal of services work.]