Added keybinding "other-window"; commented unused code