Some complementary changes in Unregister method in ServicesMapper