simplify removehook by not requiring the hook kind argument