diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc
index a6266f6007..1478d41628 100644
--- a/gtk2_ardour/foldback_strip.cc
+++ b/gtk2_ardour/foldback_strip.cc
@@ -516,9 +516,6 @@ FoldbackStrip::init ()
 	_packed   = false;
 	_embedded = false;
 
-	_session->engine ().Stopped.connect (*this, invalidator (*this), boost::bind (&FoldbackStrip::engine_stopped, this), gui_context ());
-	_session->engine ().Running.connect (*this, invalidator (*this), boost::bind (&FoldbackStrip::engine_running, this), gui_context ());
-
 	name_button.signal_button_press_event ().connect (sigc::mem_fun (*this, &FoldbackStrip::name_button_button_press), false);
 	_previous_button.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &FoldbackStrip::cycle_foldbacks), false));
 	_next_button.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &FoldbackStrip::cycle_foldbacks), true));
@@ -615,22 +612,33 @@ FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
 	output_button.set_route (_route, this);
 
 	insert_box->set_route (_route);
-	revert_to_default_display ();
 	update_fb_level_control ();
 
 	_showing_sends = false;
 	_show_sends_button.set_active (false);
 	send_blink_connection.disconnect ();
 
+
+	/* setup panners */
+	panner_ui ().set_panner (_route->main_outs ()->panner_shell (), _route->main_outs ()->panner ());
+	update_panner_choices ();
+	panner_ui ().setup_pan ();
+	panner_ui ().set_send_drawing_mode (false);
+
+	if (has_audio_outputs ()) {
+		panners.show_all ();
+	} else {
+		panners.hide_all ();
+	}
+
 	if (_route->panner_shell ()) {
 		update_panner_choices ();
 		_route->panner_shell ()->Changed.connect (route_connections, invalidator (*this), boost::bind (&FoldbackStrip::connect_to_pan, this), gui_context ());
 	}
 
-	// set up metering
+	/* set up metering */
 	_peak_meter = _route->shared_peak_meter ().get ();
 	_route->set_meter_point (MeterPostFader);
-	// _route->set_meter_point (MeterPreFader);
 	_route->set_meter_type (MeterPeak0dB);
 
 	_route->output ()->changed.connect (*this, invalidator (*this), boost::bind (&FoldbackStrip::update_output_display, this), gui_context ());
@@ -648,6 +656,7 @@ FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
 	panners.setup_pan ();
 	panners.show_all ();
 	update_output_display ();
+	reset_strip_style ();
 
 	add_events (Gdk::BUTTON_RELEASE_MASK);
 	update_sensitivity ();
@@ -1062,27 +1071,6 @@ FoldbackStrip::map_frozen ()
 	RouteUI::map_frozen ();
 }
 
-void
-FoldbackStrip::hide_redirect_editors ()
-{
-	_route->foreach_processor (sigc::mem_fun (*this, &FoldbackStrip::hide_processor_editor));
-}
-
-void
-FoldbackStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
-{
-	boost::shared_ptr<Processor> processor (p.lock ());
-	if (!processor) {
-		return;
-	}
-
-	Gtk::Window* w = insert_box->get_processor_ui (processor);
-
-	if (w) {
-		w->hide ();
-	}
-}
-
 void
 FoldbackStrip::reset_strip_style ()
 {
@@ -1093,60 +1081,6 @@ FoldbackStrip::reset_strip_style ()
 	}
 }
 
-void
-FoldbackStrip::engine_stopped ()
-{
-}
-
-void
-FoldbackStrip::engine_running ()
-{
-}
-
-void
-FoldbackStrip::drop_send ()
-{
-	boost::shared_ptr<Send> current_send;
-
-	if (_current_delivery && ((current_send = boost::dynamic_pointer_cast<Send> (_current_delivery)) != 0)) {
-		current_send->set_metering (false);
-	}
-
-	send_gone_connection.disconnect ();
-	output_button.set_sensitive (true);
-	set_invert_sensitive (true);
-	_comment_button.set_sensitive (true);
-	fb_level_control->set_sensitive (true);
-}
-
-void
-FoldbackStrip::set_current_delivery (boost::shared_ptr<Delivery> d)
-{
-	_current_delivery = d;
-	DeliveryChanged (_current_delivery);
-}
-
-void
-FoldbackStrip::revert_to_default_display ()
-{
-	drop_send ();
-
-	set_current_delivery (_route->main_outs ());
-
-	panner_ui ().set_panner (_route->main_outs ()->panner_shell (), _route->main_outs ()->panner ());
-	update_panner_choices ();
-	panner_ui ().setup_pan ();
-	panner_ui ().set_send_drawing_mode (false);
-
-	if (has_audio_outputs ()) {
-		panners.show_all ();
-	} else {
-		panners.hide_all ();
-	}
-
-	reset_strip_style ();
-}
-
 void
 FoldbackStrip::set_button_names ()
 {
diff --git a/gtk2_ardour/foldback_strip.h b/gtk2_ardour/foldback_strip.h
index 8e02b36dcc..cc8dbec62b 100644
--- a/gtk2_ardour/foldback_strip.h
+++ b/gtk2_ardour/foldback_strip.h
@@ -129,7 +129,6 @@ public:
 	void fast_update ();
 	void set_route (boost::shared_ptr<ARDOUR::Route>);
 	void set_button_names ();
-	void revert_to_default_display ();
 
 	PannerUI& panner_ui ()
 	{
@@ -155,7 +154,7 @@ public:
 	}
 
 	/** The delivery that we are handling the level for with our fader has changed */
-	PBD::Signal1<void, boost::weak_ptr<ARDOUR::Delivery>> DeliveryChanged;
+	PBD::Signal1<void, boost::weak_ptr<ARDOUR::Delivery> > DeliveryChanged;
 
 	static PBD::Signal1<void, FoldbackStrip*> CatchDeletion;
 
@@ -209,12 +208,6 @@ private:
 	void route_property_changed (const PBD::PropertyChange&);
 	void name_changed ();
 	void map_frozen ();
-	void hide_processor_editor (boost::weak_ptr<ARDOUR::Processor> processor);
-	void hide_redirect_editors ();
-	void engine_running ();
-	void engine_stopped ();
-	void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
-	void drop_send ();
 
 	Gtk::Menu* build_route_ops_menu ();
 	Gtk::Menu* build_route_select_menu ();