diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 856d6b889d..c5ad620568 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1711,10 +1711,6 @@ Editor::parameter_changed (std::string p)
 		}
 	} else if (p == "show-region-gain") {
 		set_gain_envelope_visibility ();
-	} else if (p == "remote-model") {
-		if (_routes) {
-			_routes->reset_remote_control_ids ();
-		}
 	} else if (p == "skip-playback") {
 		Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback"));
 
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 446e27375d..7a6e22e76d 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -518,7 +518,6 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 			}
 		}
 	}
-	_editor->_routes->reset_remote_control_ids ();
 }
 
 void
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 63abf2e901..3c4766f79e 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -971,15 +971,6 @@ EditorRoutes::show_track_in_display (TimeAxisView& tv)
 	}
 }
 
-void
-EditorRoutes::reset_remote_control_ids ()
-{
-	if (Config->get_remote_model() == UserOrdered || !_session || _session->deletion_in_progress()) {
-		return;
-	}
-
-	sync_presentation_info_from_treeview ();
-}
 void
 EditorRoutes::sync_presentation_info_from_treeview ()
 {
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 869c28c492..29e8b45dba 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -65,7 +65,6 @@ public:
 	void hide_all_tracks (bool);
 	void clear ();
 	void sync_presentation_info_from_treeview ();
-	void reset_remote_control_ids ();
 
 private:
 	void initial_display ();
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 776e711fbd..ef3228375a 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -655,7 +655,7 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 void
 Mixer_UI::sync_presentation_info_from_treeview ()
 {
-	if (ignore_reorder || !_session || _session->deletion_in_progress() || (Config->get_remote_model() != MixerOrdered)) {
+	if (ignore_reorder || !_session || _session->deletion_in_progress()) {
 		return;
 	}
 
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2972274898..4d811c1c9b 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2850,18 +2850,6 @@ if (!ARDOUR::Profile->get_mixbus()) {
 
 	add_option (_("Control Surfaces"), new ControlSurfacesOptions);
 
-	ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
-		"remote-model",
-		_("Control surface remote ID"),
-		sigc::mem_fun (*_rc_config, &RCConfiguration::get_remote_model),
-		sigc::mem_fun (*_rc_config, &RCConfiguration::set_remote_model)
-		);
-
-	rm->add (UserOrdered, _("assigned by user"));
-	rm->add (MixerOrdered, _("follows order of mixer"));
-
-	add_option (_("Control Surfaces"), rm);
-
 	/* VIDEO Timeline */
 	add_option (_("Video"), new VideoTimelineOptions (_rc_config));