Removed double-notification on service unregistration