diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index cfd929b50f..5e2dc4409a 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -340,18 +340,6 @@ BasicUI::transport_play (bool from_last_start)
 		return;
 	}
 
-#if 0
-	if (session->config.get_external_sync()) {
-		switch (TransportMasterManager::instance().current().type()) {
-		case Engine:
-			break;
-		default:
-			/* transport controlled by the master */
-			return;
-		}
-	}
-#endif
-
 	bool rolling = transport_rolling();
 
 	if (session->get_play_loop()) {
@@ -805,98 +793,3 @@ BasicUI::goto_nth_marker (int n)
 	}
 }
 
-#if 0
-this stuff is waiting to go in so that all UIs can offer complex solo/mute functionality
-
-void
-BasicUI::solo_release (boost::shared_ptr<Route> r)
-{
-}
-
-void
-BasicUI::solo_press (boost::shared_ptr<Route> r, bool momentary, bool global, bool exclusive, bool isolate, bool solo_group)
-{
-	if (momentary) {
-		_solo_release = new SoloMuteRelease (_route->soloed());
-	}
-
-	if (global) {
-
-		if (_solo_release) {
-			_solo_release->routes = _session->get_routes ();
-		}
-
-		if (Config->get_solo_control_is_listen_control()) {
-			_session->set_listen (_session->get_routes(), !_route->listening(),  Session::rt_cleanup, true);
-		} else {
-			_session->set_solo (_session->get_routes(), !_route->soloed(),  Session::rt_cleanup, true);
-		}
-
-	} else if (exclusive) {
-
-		if (_solo_release) {
-			_solo_release->exclusive = true;
-
-			boost::shared_ptr<RouteList> routes = _session->get_routes();
-
-			for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-				if ((*i)->soloed ()) {
-					_solo_release->routes_on->push_back (*i);
-				} else {
-					_solo_release->routes_off->push_back (*i);
-				}
-			}
-		}
-
-		if (Config->get_solo_control_is_listen_control()) {
-			/* ??? we need a just_one_listen() method */
-		} else {
-			_session->set_just_one_solo (_route, true);
-		}
-
-	} else if (isolate) {
-
-		// shift-click: toggle solo isolated status
-
-		_route->set_solo_isolated (!_route->solo_isolated(), this);
-		delete _solo_release;
-		_solo_release = 0;
-
-	} else if (solo_group) {
-
-		/* Primary-button1: solo mix group.
-		   NOTE: Primary-button2 is MIDI learn.
-		*/
-
-		if (_route->route_group()) {
-
-			if (_solo_release) {
-				_solo_release->routes = _route->route_group()->route_list();
-			}
-
-			if (Config->get_solo_control_is_listen_control()) {
-				_session->set_listen (_route->route_group()->route_list(), !_route->listening(),  Session::rt_cleanup, true);
-			} else {
-				_session->set_solo (_route->route_group()->route_list(), !_route->soloed(),  Session::rt_cleanup, true);
-			}
-		}
-
-	} else {
-
-		/* click: solo this route */
-
-		boost::shared_ptr<RouteList> rl (new RouteList);
-		rl->push_back (route());
-
-		if (_solo_release) {
-			_solo_release->routes = rl;
-		}
-
-		if (Config->get_solo_control_is_listen_control()) {
-			_session->set_listen (rl, !_route->listening());
-		} else {
-			_session->set_solo (rl, !_route->soloed());
-		}
-	}
-}
-#endif
diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index 4010732918..34f380bf2d 100644
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -123,15 +123,6 @@ ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr<ARDOUR
 bool
 ControlProtocol::set_route_table (uint32_t table_index, uint32_t remote_control_id)
 {
-#if 0 // STRIPABLE
-	boost::shared_ptr<Route> r = session->route_by_remote_id (remote_control_id);
-
-	if (!r) {
-		return false;
-	}
-
-	set_route_table (table_index, r);
-#endif
 	return true;
 }
 
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 147f2d9931..04da4f83e6 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -35,8 +35,6 @@
 
 namespace ARDOUR {
 	class Session;
-	class SessionEvent;
-	class Stripable;
 }
 
 class LIBCONTROLCP_API BasicUI {
@@ -47,9 +45,6 @@ class LIBCONTROLCP_API BasicUI {
 	void add_marker (const std::string& = std::string());
 	void remove_marker_at_playhead ();
 
-//	void mark_in();
-//	void mark_out();
-
 	void register_thread (std::string name);
 
 	/* transport control */