Separating register / unregister actions