diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h
index 60db264b4d..da4e6e3bee 100644
--- a/libs/ardour/ardour/panner_shell.h
+++ b/libs/ardour/ardour/panner_shell.h
@@ -85,7 +85,6 @@ public:
 	bool select_panner_by_uri (std::string const uri);
 
   private:
-	friend class Route;
 	void distribute_no_automation (BufferSet& src, BufferSet& dest, pframes_t nframes, gain_t gain_coeff);
 	bool set_user_selected_panner_uri (std::string const uri);
 
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 0d200ae44c..83605d7413 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -255,7 +255,6 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	int remove_processor (boost::shared_ptr<Processor>, ProcessorStreams* err = 0, bool need_process_lock = true);
 	int remove_processors (const ProcessorList&, ProcessorStreams* err = 0);
 	int reorder_processors (const ProcessorList& new_order, ProcessorStreams* err = 0);
-	void set_custom_panner_uri (std::string const panner_uri);
 	void disable_processors (Placement);
 	void disable_processors ();
 	void disable_plugins (Placement);
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 046bf7998e..a9122ab673 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1568,63 +1568,6 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams*
 	return 0;
 }
 
-#if 0
-/* currently unused (again) -- but will come in handy soon (again)
- * once there is an option to link route + delivery panner settings
- */
-void
-Route::set_custom_panner_uri (std::string const panner_uri)
-{
-	if (_in_configure_processors) {
-		DEBUG_TRACE (DEBUG::Panning, string_compose (_("Route::set_custom_panner_uri '%1' -- called while in_configure_processors\n"), name()));
-		return;
-	}
-
-	if (!_main_outs->panner_shell()->set_user_selected_panner_uri(panner_uri)) {
-		DEBUG_TRACE (DEBUG::Panning, string_compose (_("Route::set_custom_panner_uri '%1 '%2' -- no change needed\n"), name(), panner_uri));
-		/* no change needed */
-		return;
-	}
-
-	DEBUG_TRACE (DEBUG::Panning, string_compose (_("Route::set_custom_panner_uri '%1 '%2' -- reconfigure I/O\n"), name(), panner_uri));
-
-	/* reconfigure I/O -- re-initialize panner modules */
-	{
-		Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
-		Glib::Threads::RWLock::WriterLock lm (_processor_lock);
-
-		for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p) {
-			boost::shared_ptr<Delivery> dl;
-			boost::shared_ptr<Panner> panner;
-			if ((dl = boost::dynamic_pointer_cast<Delivery> (*p)) == 0) {
-				continue;
-			}
-			if (!dl->panner_shell()) {
-				continue;
-			}
-			if (!(panner = dl->panner_shell()->panner())) {
-				continue;
-			}
-			/* _main_outs has already been set before the loop.
-			 * Ignore the return status here. It need reconfiguration */
-			if (dl->panner_shell() != _main_outs->panner_shell()) {
-				if (!dl->panner_shell()->set_user_selected_panner_uri(panner_uri)) {
-					continue;
-				}
-			}
-
-			ChanCount in = panner->in();
-			ChanCount out = panner->out();
-			dl->panner_shell()->configure_io(in, out);
-			dl->panner_shell()->pannable()->set_panner(dl->panner_shell()->panner());
-		}
-	}
-
-	processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
-	_session.set_dirty ();
-}
-#endif
-
 void
 Route::reset_instrument_info ()
 {