Remove keymap stuff too