Better key-binding for commenting, remove some obsolete key-bindings