Add ability to unregister a handler