UPDATE: Correctly deregister handlers