Fix removing handlers.