remove dead code
fix key bindings tests
reinstate undead code