Cleanup.
Simplified key bindings.