Don't blow the stack when calling removeKeymap

Also call remove instead of removeKeymap internally.