diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 40ce03d778..17ff0f7217 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -381,13 +381,9 @@ EngineControl::list_devices ()
 	}
 
 	set_popdown_strings (device_combo, available_devices);
-	set_popdown_strings (input_device_combo, available_devices);
-	set_popdown_strings (output_device_combo, available_devices);
 	
 	if (!available_devices.empty()) {
 		device_combo.set_active_text (available_devices.front());
-		input_device_combo.set_active_text (available_devices.front());
-		output_device_combo.set_active_text (available_devices.front());
 	}
 
 	device_changed ();
@@ -525,26 +521,6 @@ EngineControl::show_buffer_duration ()
 	buffer_size_duration_label.set_text (buf);
 }
 
-void
-EngineControl::audio_mode_changed ()
-{
-	std::string str = audio_mode_combo.get_active_text();
-
-	if (str == _("Playback/recording on 1 device")) {
-		input_device_combo.set_sensitive (false);
-		output_device_combo.set_sensitive (false);
-	} else if (str == _("Playback/recording on 2 devices")) {
-		input_device_combo.set_sensitive (true);
-		output_device_combo.set_sensitive (true);
-	} else if (str == _("Playback only")) {
-		output_device_combo.set_sensitive (true);
-		input_device_combo.set_sensitive (false);
-	} else if (str == _("Recording only")) {
-		input_device_combo.set_sensitive (true);
-		output_device_combo.set_sensitive (false);
-	}
-}
-
 EngineControl::State*
 EngineControl::get_matching_state (const string& backend,
 				   const string& driver,
diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 940f594421..360c438571 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -55,8 +55,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     /* core fields used by all backends */
 
     Gtk::ComboBoxText backend_combo;
-    Gtk::ComboBoxText input_device_combo;
-    Gtk::ComboBoxText output_device_combo;
     Gtk::ComboBoxText sample_rate_combo;
     Gtk::ComboBoxText buffer_size_combo;
     Gtk::Label        buffer_size_duration_label;
@@ -130,7 +128,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     std::string get_device_name() const;
     std::string get_driver() const;
 
-    void audio_mode_changed ();
     void device_changed ();
     void list_devices ();
     void show_buffer_duration ();