Keyboard shortcuts cleanup