better unregister management