Add more matching to key binding modifiers
Remove dead code