diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index 80c36dab95..352b887e13 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -41,8 +41,6 @@
 
 #include <vst/aeffectx.h>
 
-#include <midi++/manager.h>
-
 #include <ardour/ardour.h>
 #include <ardour/session.h>
 #include <ardour/audioengine.h>
@@ -81,7 +79,7 @@ VSTPlugin::VSTPlugin (AudioEngine& e, Session& session, FSTHandle* h)
 
 	_plugin->dispatcher (_plugin, effSetProgram, 0, 0, NULL, 0.0f);
 	
-	Plugin::setup_midi_controls ();
+	Plugin::setup_controls ();
 }
 
 VSTPlugin::VSTPlugin (const VSTPlugin &other)
@@ -94,7 +92,7 @@ VSTPlugin::VSTPlugin (const VSTPlugin &other)
 	}
 	_plugin = _fst->plugin;
 
-	Plugin::setup_midi_controls ();
+	Plugin::setup_controls ();
 }
 
 VSTPlugin::~VSTPlugin ()
@@ -133,13 +131,6 @@ VSTPlugin::set_parameter (uint32_t which, float val)
 {
 	_plugin->setParameter (_plugin, which, val);
 	ParameterChanged (which, val); /* EMIT SIGNAL */
-
-	if (session().get_midi_feedback()) {
-		
-		if (which < parameter_count() && midi_controls[which]) {
-			midi_controls[which]->send_feedback (val);
-		}
-	}
 }
 
 float