system keyboard shortcuts
more cleanup