Remove  from types, remove keybindings