Fixed issue with service deletion

Change-Id: I9a0dfc11439f3733bb2dd06da5a3214347a700ad