diff --git a/gtk2_ardour/trx.menus.in b/gtk2_ardour/trx.menus.in
index cc346d40aa..a8a53a9cb0 100644
--- a/gtk2_ardour/trx.menus.in
+++ b/gtk2_ardour/trx.menus.in
@@ -12,6 +12,18 @@
   <accelerator action='track-mute-toggle'/>
   <accelerator action='toggle-edit-mode'/>
   <accelerator action='toggle-midi-input-active'/>
+
+<!--
+        <menuitem action='goto-mark-1'/>
+        <menuitem action='goto-mark-2'/>
+        <menuitem action='goto-mark-3'/>
+        <menuitem action='goto-mark-4'/>
+        <menuitem action='goto-mark-5'/>
+        <menuitem action='goto-mark-6'/>
+        <menuitem action='goto-mark-7'/>
+        <menuitem action='goto-mark-8'/>
+        <menuitem action='goto-mark-9'/>
+-->
   
   <menubar name='Main' action='MainMenu'>
     <menu name='Session' action='Session'>
@@ -22,35 +34,24 @@
       <separator/>
       <menuitem action='Save'/>
       <menuitem action='SaveAs'/>
-      <menuitem action='Rename'/>
-      <separator/>
-      <menuitem action='AddTrackBus'/>	
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
-      <!--menuitem action='importFromSession'/-->
-
-      <menuitem action='OpenVideo'/>
-      <menuitem action='CloseVideo'/>
-
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
-        <menuitem action='ExportVideo'/>
       </menu>
       <menu name='Cleanup' action='Cleanup'>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-      <separator/>
-      <menuitem action='toggle-session-options-editor'/>
-#ifdef GTKOSX      
+      #ifdef GTKOSX      
       <menuitem action='toggle-about'/>
       <menuitem action='toggle-rc-options-editor'/>
-#endif
-#ifndef GTKOSX
+      #endif
+      #ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
-#endif
+      #endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -63,95 +64,20 @@
         <menuitem action='play-from-edit-point-and-return'/>
         <menuitem action='Loop'/>
       </menu>
-      <menuitem action='record-roll'/>
       <menuitem action='Record'/>
-      <menuitem action='ToggleRollMaybe'/>
-      <menuitem action='ToggleRollForgetCapture'/>
-      <menu action="SetLoopMenu">
-        <menuitem action='set-loop-from-edit-range'/>
-        <menuitem action='set-loop-from-region'/>
-      </menu>
-      <menu action="SetPunchMenu">
-        <menuitem action='set-punch-from-edit-range'/>
-        <menuitem action='set-punch-from-region'/>
-      </menu>
 
-      <separator/>
-      <menuitem action='Forward'/>
-      <menuitem action='Rewind'/>
-      <menuitem action='TransitionToRoll'/>
-      <menuitem action='TransitionToReverse'/>
-      <separator/>
-
-      
       <menu action="MovePlayHeadMenu">
-        <menuitem action='set-playhead'/>
-        <menuitem action='playhead-to-edit'/>
-        <menuitem action='center-playhead'/>
-        <separator/>
-        <menuitem action='nudge-playhead-forward'/>
-        <menuitem action='nudge-playhead-backward'/>
-        <separator/>
-        <menuitem action='tab-to-transient-forwards'/>
-        <menuitem action='tab-to-transient-backwards'/>
-        <separator/>
-        <menuitem action='playhead-forward-to-grid'/>
-        <menuitem action='playhead-backward-to-grid'/>
-        <separator/>
-        <menuitem action='playhead-to-next-region-boundary'/>
-        <menuitem action='playhead-to-previous-region-boundary'/>
-        <menuitem action='playhead-to-next-region-boundary-noselection'/>
-        <menuitem action='playhead-to-previous-region-boundary-noselection'/>
-        <menuitem action='playhead-to-next-region-sync'/>
-        <menuitem action='playhead-to-previous-region-sync'/>
-        <separator/>
         <menuitem action='jump-forward-to-mark'/>
         <menuitem action='jump-backward-to-mark'/>
-        <separator/>
-        <menuitem action='GotoZero'/>
         <menuitem action='GotoStart'/>
         <menuitem action='GotoEnd'/>
-        <menuitem action='GotoWallClock'/>
-      </menu>
-
-      <menu action="MoveActiveMarkMenu">
-        <menuitem action='selected-marker-to-next-region-boundary'/>
-        <menuitem action='selected-marker-to-previous-region-boundary'/>
-        <menuitem action='edit-cursor-to-next-region-sync'/>
-        <menuitem action='edit-cursor-to-previous-region-sync'/>
-        <separator/>
-        <menuitem action='edit-to-playhead'/>
-        <menuitem action='set-edit-point'/>
-      </menu>
-
-      <menu action="MarkerMenu">
-        <menuitem action='add-location-from-playhead'/>
-        <separator/>
-        <menuitem action='goto-mark-1'/>
-        <menuitem action='goto-mark-2'/>
-        <menuitem action='goto-mark-3'/>
-        <menuitem action='goto-mark-4'/>
-        <menuitem action='goto-mark-5'/>
-        <menuitem action='goto-mark-6'/>
-        <menuitem action='goto-mark-7'/>
-        <menuitem action='goto-mark-8'/>
-        <menuitem action='goto-mark-9'/>
       </menu>
 
       <separator/>
-      <menuitem action='ToggleTimeMaster'/>
-      <menuitem action='TogglePunch'/>
-      <menuitem action='TogglePunchIn'/>
-      <menuitem action='TogglePunchOut'/>
-      <menuitem action='ToggleAutoInput'/>
-      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='ToggleAutoPlay'/>
       <menuitem action='ToggleAutoReturn'/>
-      <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
-      <menuitem action='ToggleFollowEdits'/>
-      <menuitem action='panic'/>
-     <separator/>
+      <separator/>
     </menu>
 
     <menu name='Edit' action='Edit'>
@@ -165,205 +91,40 @@
         <menuitem action='select-all'/>
         <menuitem action='deselect-all'/>
         <menuitem action='invert-selection'/>
-        <menuitem action='select-all-after-edit-cursor'/>
-        <menuitem action='select-all-before-edit-cursor'/>
-        <menuitem action='select-all-between-cursors'/>
-        <menuitem action='select-all-within-cursors'/>
-        <menuitem action='select-all-in-punch-range'/>
-        <menuitem action='select-all-in-loop-range'/>
-        <separator/>
-        <menuitem action='select-range-between-cursors'/>
-        <menuitem action='move-range-start-to-previous-region-boundary'/>
-        <menuitem action='move-range-start-to-next-region-boundary'/>
-        <menuitem action='move-range-end-to-previous-region-boundary'/>
-        <menuitem action='move-range-end-to-next-region-boundary'/>
-        <menuitem action='start-range'/>
-        <menuitem action='finish-range'/>
-        <menuitem action='finish-add-range'/>
-        <separator/>
-        <menuitem action='select-next-route'/>
-        <menuitem action='select-prev-route'/>
       </menu>	   
       <separator/>
       <menuitem action='editor-delete'/>
       <menuitem action='editor-crop'/>
       <menuitem action='split-region'/>
-      <menuitem action='split-region-at-transients'/>
-      <menu action="SeparateMenu">
-        <menuitem action='separate-under-region'/>
-        <menuitem action='editor-separate'/>
-        <menuitem action='separate-from-loop'/>
-        <menuitem action='separate-from-punch'/>
-        <separator/>
-      </menu>
-      <menu action="AlignMenu">
-        <menuitem action='align-regions-start'/>
-        <menuitem action='align-regions-start-relative'/>
-        <menuitem action='align-regions-end'/>
-        <menuitem action='align-regions-end-relative'/>
-        <menuitem action='align-regions-sync'/>
-        <menuitem action='align-regions-sync-relative'/>
-      </menu>
-      <menu action="FadeMenu">
-        <menuitem action='set-fade-in-length'/>
-        <menuitem action='toggle-region-fade-in'/>
-        <menuitem action='set-fade-out-length'/>
-        <menuitem action='toggle-region-fade-out'/>
-      </menu>
-      <separator/>       
-      <menuitem action='remove-last-capture'/>
       <separator/>
-      <menu action="EditPointMenu">
-        <menuitem action='cycle-edit-point'/>
-        <menuitem action='cycle-edit-point-with-marker'/>
-      </menu>
-      <separator/>
-      <menu action="TempoMenu">
-        <menuitem action='set-tempo-from-region'/>
-        <menuitem action='set-tempo-from-edit-range'/>
-      </menu>
-      <menuitem action='set-mouse-mode-object-range'/>
-#ifndef GTKOSX
+      #ifndef GTKOSX
       <separator/>
       <menuitem action='toggle-rc-options-editor'/>
-#endif
+      #endif
     </menu>         
 
-    <menu name='RegionMenu' action='RegionMenu'>
-      <menuitem action='insert-region-from-region-list'/>
-      <menuitem action='play-selected-regions'/>
-      <menuitem action='loop-region'/>
-      <menuitem action='rename-region'/>
-      <menuitem action='show-region-properties'/>
-      <menu action='RegionMenuEdit'>
-         <menuitem action='combine-regions'/>
-         <menuitem action='uncombine-regions'/>
-         <menuitem action='analyze-region'/>
-         <menuitem action='toggle-opaque-region'/>
-         <menuitem action='toggle-region-mute'/>
-         <menuitem action='pitch-shift-region'/>
-         <menuitem action='split-region'/>
-         <menuitem action='split-multichannel-region'/>
-         <menuitem action='close-region-gaps'/>
-         <menuitem action='place-transient' />
-         <menuitem action='show-rhythm-ferret'/>
-         <menuitem action='strip-region-silence'/>
-         <menuitem action='reverse-region'/>    
-      </menu>
-      <menu action='RegionMenuLayering'>
-        <menuitem action='raise-region-to-top'/>
-        <menuitem action='raise-region'/>
-        <menuitem action='lower-region'/>
-        <menuitem action='lower-region-to-bottom'/>
-      </menu>
-      <menu action='RegionMenuMIDI'>
-        <menuitem action='transpose-region'/>
-        <menuitem action='insert-patch-change'/>
-        <menuitem action='quantize-region'/>
-        <menuitem action='fork-region'/>
-        <menuitem action='show-region-list-editor'/>
-      </menu>
-      <menu action='RegionMenuGain'>
-        <menuitem action='normalize-region'/>
-        <menuitem action='boost-region-gain'/>
-        <menuitem action='cut-region-gain'/>      		   
-        <menuitem action='reset-region-gain-envelopes'/>
-        <menuitem action='toggle-region-gain-envelope-active'/>
-      </menu>
-      <menu action='RegionMenuPosition'>
-        <menuitem action='naturalize-region'/>
-        <menuitem action='snap-regions-to-grid'/>
-        <menuitem action='toggle-region-lock'/>
-        <menuitem action='toggle-region-lock-style'/>
-        <menuitem action='toggle-region-video-lock'/>
-        <menuitem action='set-region-sync-position'/>
-        <menuitem action='remove-region-sync'/>
-        <menuitem action='nudge-forward'/>
-        <menuitem action='nudge-backward'/>
-        <menuitem action='nudge-forward-by-capture-offset'/>
-        <menuitem action='nudge-backward-by-capture-offset'/>
-      </menu>
-      <menu action='RegionMenuTrim'>
-        <menuitem action='trim-front'/>
-        <menuitem action='trim-back'/>
-        <menuitem action='trim-region-to-loop'/>
-        <menuitem action='trim-region-to-punch'/>
-        <menuitem action='trim-to-previous-region'/>
-        <menuitem action='trim-to-next-region'/>
-      </menu>
-      <menu action='RegionMenuRanges'>
-        <menuitem action='set-loop-from-region'/>
-        <menuitem action='set-punch-from-region'/>
-        <menuitem action='add-range-marker-from-region'/>
-        <menuitem action='add-range-markers-from-region'/>
-        <menuitem action='set-selection-from-region'/>
-      </menu>
-      <menu action='RegionMenuFades'>
-        <menuitem action='toggle-region-fade-in'/>
-        <menuitem action='toggle-region-fade-out'/>
-        <menuitem action='toggle-region-fades'/>
-      </menu>
-      <menu action='RegionMenuDuplicate'>
-        <menuitem action='duplicate-region'/>
-        <menuitem action='multi-duplicate-region'/>
-        <menuitem action='region-fill-track'/>
-      </menu>
-      <menuitem action='export-region'/>
-      <menuitem action='bounce-regions-processed'/>
-      <menuitem action='bounce-regions-unprocessed'/>
-      <separator/>
-      <menuitem action='remove-region'/>
-    </menu>
-
     <menu action='TrackMenu'>
       <menuitem action='AddTrackBus'/>	
-      <menuitem action='insert-time'/>
       <menuitem action="move-selected-tracks-up"/>
       <menuitem action="move-selected-tracks-down"/>
-      <menu action='TrackHeightMenu'>
-        <menuitem action='fit-tracks'/>
-        <menuitem action='track-height-largest'/>
-        <menuitem action='track-height-larger'/>
-        <menuitem action='track-height-large'/>
-        <menuitem action='track-height-normal'/>
-        <menuitem action='track-height-small'/>
-      </menu>
-      <menuitem action='track-record-enable-toggle'/>
-      <menuitem action='toggle-track-active'/>	
-      <menuitem action='remove-track'/>	
     </menu>
 
     <menu name='View' action = 'View'>
-      <menuitem action='ToggleMaximalEditor'/>
-      <menuitem action='ToggleMaximalMixer'/>
       <menuitem action='KeepTearoffs'/>
 
       <separator/>
 
       <menu action="PrimaryClockMenu">
         <menuitem action="primary-clock-timecode"/>
-        <menuitem action="primary-clock-bbt"/>
         <menuitem action="primary-clock-minsec"/>
         <menuitem action="primary-clock-samples"/>
       </menu>
-      <menu action="SecondaryClockMenu">
-        <menuitem action="secondary-clock-timecode"/>
-        <menuitem action="secondary-clock-bbt"/>
-        <menuitem action="secondary-clock-minsec"/>
-        <menuitem action="secondary-clock-samples"/>
-      </menu>
 
       <separator/>
 
       <menu action="ZoomMenu">
         <menuitem action='temporal-zoom-in'/>
         <menuitem action='temporal-zoom-out'/>
-        <menuitem action='zoom-to-session'/>
-        <menuitem action='zoom-to-region'/>
-        <menuitem action='zoom-to-region-both-axes'/>
-        <menuitem action='toggle-zoom'/>
-        <menuitem action='expand-tracks'/>
-        <menuitem action='shrink-tracks'/>
       </menu>
       <menu name='ZoomFocus' action='ZoomFocus'>
         <menuitem action='zoom-focus-left'/>
@@ -374,151 +135,29 @@
         <menuitem action='zoom-focus-edit'/>
         <menuitem action='cycle-zoom-focus'/>
       </menu>
-      <menu name='SnapMode' action='SnapMode'>
-        <menuitem action='snap-off'/>
-        <menuitem action='snap-normal'/>
-        <menuitem action='snap-magnetic'/>
-        <separator/>
-        <menuitem action='cycle-snap-mode'/>
-        <menuitem action='next-snap-choice'/>
-        <menuitem action='prev-snap-choice'/>
-        <menuitem action='next-snap-choice-music-only'/>
-        <menuitem action='prev-snap-choice-music-only'/>
-      </menu>
-      <menu name='SnapTo' action='SnapTo'>
-        <menuitem action='snap-to-cd-frame'/>
-        <menuitem action='snap-to-timecode-frame'/>
-        <menuitem action='snap-to-timecode-seconds'/>
-        <menuitem action='snap-to-timecode-minutes'/>
-        <menuitem action='snap-to-seconds'/>
-        <menuitem action='snap-to-minutes'/>
-        <menuitem action='snap-to-onetwentyeighths'/>
-        <menuitem action='snap-to-sixtyfourths'/>
-        <menuitem action='snap-to-thirtyseconds'/>
-        <menuitem action='snap-to-twentyeighths'/>
-        <menuitem action='snap-to-twentyfourths'/>
-        <menuitem action='snap-to-twentieths'/>
-        <menuitem action='snap-to-asixteenthbeat'/>
-        <menuitem action='snap-to-fourteenths'/>
-        <menuitem action='snap-to-twelfths'/>
-        <menuitem action='snap-to-tenths'/>
-        <menuitem action='snap-to-eighths'/>
-        <menuitem action='snap-to-sevenths'/>
-        <menuitem action='snap-to-sixths'/>
-        <menuitem action='snap-to-fifths'/>
-        <menuitem action='snap-to-quarters'/>
-        <menuitem action='snap-to-thirds'/>
-        <menuitem action='snap-to-halves'/>
-        <menuitem action='snap-to-beat'/>
-        <menuitem action='snap-to-bar'/>
-        <menuitem action='snap-to-mark'/>
-        <menuitem action='snap-to-region-start'/>
-        <menuitem action='snap-to-region-end'/>
-        <menuitem action='snap-to-region-sync'/>
-        <menuitem action='snap-to-region-boundary'/>
-      </menu>
 
       <menu action="RulerMenu">
         <menuitem action="toggle-minsec-ruler"/>
         <menuitem action="toggle-samples-ruler"/>
-        <menuitem action="toggle-bbt-ruler"/>
         <separator/>
-        <menuitem action="toggle-meter-ruler"/>
-        <menuitem action="toggle-tempo-ruler"/>
-        <menuitem action="toggle-loop-punch-ruler"/>
-        <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
-        <separator/>
-        <menuitem action="toggle-video-ruler"/>
       </menu>
-      <menu action="VideoMonitorMenu">
-        <menuitem action="zoom-vmon-100"/>
-        <menuitem action="toggle-vmon-letterbox"/>
-        <separator/>
-        <menuitem action="toggle-vmon-ontop"/>
-        <menuitem action="toggle-vmon-fullscreen"/>
-        <separator/>
-        <menuitem action="toggle-vmon-timecode"/>
-        <menuitem action="toggle-vmon-frame"/>
-        <menuitem action="toggle-vmon-osdbg"/>
-      </menu>
-      <menu action="ScrollMenu">
-        <menuitem action='scroll-tracks-down'/>
-        <menuitem action='scroll-tracks-up'/>
-        <menuitem action='scroll-forward'/>
-        <menuitem action='scroll-backward'/>
-      </menu>
-      <menu action="SavedViewMenu">
-        <menuitem action='save-visual-state-1'/>
-        <menuitem action='goto-visual-state-1'/>
-        <menuitem action='save-visual-state-2'/>
-        <menuitem action='goto-visual-state-2'/>
-        <menuitem action='save-visual-state-3'/>
-        <menuitem action='goto-visual-state-3'/>
-        <menuitem action='save-visual-state-4'/>
-        <menuitem action='goto-visual-state-4'/>
-        <menuitem action='save-visual-state-5'/>
-        <menuitem action='goto-visual-state-5'/>
-        <menuitem action='save-visual-state-6'/>
-        <menuitem action='goto-visual-state-6'/>
-        <menuitem action='save-visual-state-7'/>
-        <menuitem action='goto-visual-state-7'/>
-        <menuitem action='save-visual-state-8'/>
-        <menuitem action='goto-visual-state-8'/>
-        <menuitem action='save-visual-state-9'/>
-        <menuitem action='goto-visual-state-9'/>
-        <menuitem action='save-visual-state-10'/>
-        <menuitem action='goto-visual-state-10'/>
-        <menuitem action='save-visual-state-11'/>
-        <menuitem action='goto-visual-state-11'/>
-        <menuitem action='save-visual-state-12'/>
-        <menuitem action='goto-visual-state-12'/>
-      </menu>
-
-      <separator/>
-
       <menuitem action='show-editor-mixer'/>
-      <menuitem action='show-editor-list'/>
-      <menuitem action='ToggleMeasureVisibility'/>
-      <menuitem action='ToggleSummary'/>
-      <menuitem action='ToggleGroupTabs'/>
-      <menuitem action='show-marker-lines'/>
     </menu>
     <menu action = 'WindowMenu'>
-      <menuitem action='toggle-audio-midi-setup'/>
-      <separator/>
       <menuitem action='toggle-mixer'/>
       <menuitem action='toggle-meterbridge'/>
       <menuitem action='toggle-editor-mixer'/>
       <separator/>
-      <menuitem action='toggle-inspector'/>
       <menuitem action='toggle-locations'/>
       <menuitem action='toggle-key-editor'/>
-      <menuitem action='toggle-bundle-manager'/>
-      <menuitem action='toggle-theme-manager'/>
       <menuitem action='toggle-big-clock'/>
-#if 0
-      <menuitem action='toggle-speaker-config'/>
-#endif
-
-      <separator/>
-
-      <menuitem action='ToggleJadeo'/>
-      <separator/>
-
-      <menuitem action='NewMIDITracer'/>
-      <menuitem action='toggle-audio-connection-manager'/>
-      <menuitem action='toggle-midi-connection-manager'/>
-      <menuitem action='toggle-log-window'/>
-      <separator/>
     </menu>
     <menu name='Help' action='Help'>
-#ifndef GTKOSX
+      #ifndef GTKOSX
       <menuitem action='toggle-about'/>
-#endif
-      <menuitem action='Chat'/>
+      #endif
       <menuitem action='Manual'/>
-      <menuitem action='Reference'/>
     </menu>
   </menubar>
 
@@ -526,17 +165,7 @@
     <menuitem action="toggle-minsec-ruler"/>
     <menuitem action="toggle-timecode-ruler"/>
     <menuitem action="toggle-samples-ruler"/>
-    <menuitem action="toggle-bbt-ruler"/>
-    <separator/>
-    <menuitem action="toggle-meter-ruler"/>
-    <menuitem action="toggle-timecode-ruler"/>
-    <menuitem action="toggle-tempo-ruler"/>
-    <menuitem action="toggle-range-ruler"/>
     <menuitem action="toggle-marker-ruler"/>
-    <menuitem action="toggle-cd-marker-ruler"/>
-    <menuitem action="toggle-loop-punch-ruler"/>
-    <separator/>
-    <menuitem action="toggle-video-ruler"/>
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -604,23 +233,21 @@
   </popup>
 
   <popup name='PopupRegionMenu' action='PopupRegionMenu'>
-    <menuitem action='play-selected-regions'/>
     <menuitem action='loop-region'/>
     <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
     <menu action='RegionMenuEdit'>
-       <menuitem action='combine-regions'/>
-       <menuitem action='uncombine-regions'/>
-       <menuitem action='split-region'/>
-       <menuitem action='split-multichannel-region'/>
-       <menuitem action='toggle-opaque-region'/>
-       <menuitem action='toggle-region-mute'/>
-       <menuitem action='pitch-shift-region'/>
-       <menuitem action='reverse-region'/>    
-       <menuitem action='close-region-gaps'/>
-       <menuitem action='place-transient' />
-       <menuitem action='show-rhythm-ferret'/>
-       <menuitem action='strip-region-silence'/>
+      <menuitem action='combine-regions'/>
+      <menuitem action='uncombine-regions'/>
+      <menuitem action='split-region'/>
+      <menuitem action='split-multichannel-region'/>
+      <menuitem action='toggle-opaque-region'/>
+      <menuitem action='toggle-region-mute'/>
+      <menuitem action='pitch-shift-region'/>
+      <menuitem action='reverse-region'/>    
+      <menuitem action='close-region-gaps'/>
+      <menuitem action='place-transient' />
+      <menuitem action='show-rhythm-ferret'/>
+      <menuitem action='strip-region-silence'/>
     </menu>
     <menu action='RegionMenuMIDI'>
       <menuitem action='transpose-region'/>