Forgot to remove registration of removed handlers