cleaned up register / unregister activities