Added ability to remove services

Change-Id: Ieb763013679356c898924444383e4ac65d373736