KeyBindings: finish cleanup