diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index a910cf996a..767971fe72 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -148,7 +148,6 @@ PBD::Signal0<void> Session::Quit;
 PBD::Signal0<void> Session::FeedbackDetected;
 PBD::Signal0<void> Session::SuccessfulGraphSort;
 PBD::Signal2<void,std::string,std::string> Session::VersionMismatch;
-PBD::Signal0<void> Session::EditorMixerChanged;
 
 const framecnt_t Session::bounce_chunk_size = 8192;
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index 4d578409c3..8accb99ea2 100644
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -371,6 +371,4 @@ ControlProtocol::stripable_selection_changed (StripableNotificationListPtr sp)
 			_first_selected_stripable = boost::weak_ptr<Stripable>();
 		}
 	}
-
-	cerr << "CP: selection now " << _last_selected.size() << endl;
 }
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index b199b64f84..f9d4f7dc57 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -249,8 +249,8 @@ OSC::start ()
 	periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &OSC::periodic));
 	periodic_timeout->attach (main_loop()->get_context());
 
-	// catch current editor mixer changes for GUI_select mode
-	session->EditorMixerChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
+	// catch changes to selection for GUI_select mode
+	StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
 
 	// catch track reordering
 	// receive routes added
@@ -2081,7 +2081,7 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
 	sur->expand_enable = false;
 	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 	if (s) {
-		session->set_stripable_selection (s);
+		SetStripableSelection (s);
 	} else {
 		route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
 	}