diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 95d86ae3b5..fca0680725 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -437,10 +437,8 @@ class Editor : public PublicEditor
 	void swap_visual_state ();
 	
 	std::vector<VisualState*> visual_states;
-	sigc::connection visual_state_op_connection;
 	void start_visual_state_op (uint32_t n);
 	void cancel_visual_state_op (uint32_t n);
-	bool end_visual_state_op (uint32_t n);
 
 	nframes64_t leftmost_frame;
 	double      frames_per_unit;
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index 7d90dcc82e..147e2ae5fb 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -182,18 +182,18 @@
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
 
 
-(gtk_accel_path "<Actions>/Editor/save-visual-state-1" "<%TERTIARY%>F1")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-2" "<%TERTIARY%>F2")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-3" "<%TERTIARY%>F3")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-4" "<%TERTIARY%>F4")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-5" "<%TERTIARY%>F5")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-6" "<%TERTIARY%>F6")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-7" "<%TERTIARY%>F7")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-8" "<%TERTIARY%>F8")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-9" "<%TERTIARY%>F9")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-10" "<%TERTIARY%>F10")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-11" "<%TERTIARY%>F11")
-(gtk_accel_path "<Actions>/Editor/save-visual-state-12" "<%TERTIARY%>F12")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-1" "<%PRIMARY%>F1")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-2" "<%PRIMARY%>F2")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-3" "<%PRIMARY%>F3")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-4" "<%PRIMARY%>F4")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-5" "<%PRIMARY%>F5")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-6" "<%PRIMARY%>F6")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-7" "<%PRIMARY%>F7")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-8" "<%PRIMARY%>F8")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-9" "<%PRIMARY%>F9")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-10" "<%PRIMARY%>F10")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-11" "<%PRIMARY%>F11")
+(gtk_accel_path "<Actions>/Editor/save-visual-state-12" "<%PRIMARY%>F12")
 
 (gtk_accel_path "<Actions>/Editor/goto-visual-state-1" "F1")
 (gtk_accel_path "<Actions>/Editor/goto-visual-state-2" "F2")