moved map addition to condition and closure
updated deactivation method to unregister services