Add the Remove() method on a service

Change-Id: I6c99be744bbc6ce63fbcb8e4b5f45cd4d046273e