vimode and key binding cleanup