diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp
index 1acacded3..75501683d 100644
--- a/plugins/channeltx/modam/ammodgui.cpp
+++ b/plugins/channeltx/modam/ammodgui.cpp
@@ -111,7 +111,7 @@ bool AMModGUI::handleMessage(const Message& message)
     }
 }
 
-void AMModGUI::viewChanged()
+void AMModGUI::channelMarkerChanged()
 {
 	applySettings();
 }
@@ -303,7 +303,7 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pare
 	m_settings.setChannelMarker(&m_channelMarker);
 	m_settings.setCWKeyerGUI(ui->cwKeyerGUI);
 
-	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
+	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
 
 	m_deviceAPI->registerChannelInstance(m_channelID, this);
     m_deviceAPI->addChannelMarker(&m_channelMarker);
diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h
index 07a4516fe..73f79da94 100644
--- a/plugins/channeltx/modam/ammodgui.h
+++ b/plugins/channeltx/modam/ammodgui.h
@@ -56,7 +56,7 @@ public:
     static const QString m_channelID;
 
 private slots:
-    void viewChanged();
+    void channelMarkerChanged();
     void handleSourceMessages();
 
     void on_deltaFrequency_changed(qint64 value);
diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp
index 52d16f23d..1e5180b53 100644
--- a/plugins/channeltx/modatv/atvmodgui.cpp
+++ b/plugins/channeltx/modatv/atvmodgui.cpp
@@ -236,7 +236,7 @@ bool ATVModGUI::handleMessage(const Message& message)
     }
 }
 
-void ATVModGUI::viewChanged()
+void ATVModGUI::channelMarkerChanged()
 {
 	applySettings();
 }
@@ -641,7 +641,7 @@ ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
 	m_channelMarker.setCenterFrequency(0);
 	m_channelMarker.setVisible(true);
 
-	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
+	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
 
 	m_deviceAPI->registerChannelInstance(m_channelID, this);
     m_deviceAPI->addChannelMarker(&m_channelMarker);
diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h
index febd1730e..7729e30e8 100644
--- a/plugins/channeltx/modatv/atvmodgui.h
+++ b/plugins/channeltx/modatv/atvmodgui.h
@@ -58,7 +58,7 @@ public:
     static const QString m_channelID;
 
 private slots:
-    void viewChanged();
+    void channelMarkerChanged();
     void channelizerOutputSampleRateChanged();
     void handleSourceMessages();
 
diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp
index 460fd69af..ae4a51374 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.cpp
+++ b/plugins/channeltx/modnfm/nfmmodgui.cpp
@@ -110,7 +110,7 @@ bool NFMModGUI::handleMessage(const Message& message)
     }
 }
 
-void NFMModGUI::viewChanged()
+void NFMModGUI::channelMarkerChanged()
 {
 	applySettings();
 }
@@ -328,7 +328,7 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
     m_channelMarker.setTitle("NFM Modulator");
 	m_channelMarker.setVisible(true);
 
-	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
+	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
 
 	m_deviceAPI->registerChannelInstance(m_channelID, this);
     m_deviceAPI->addChannelMarker(&m_channelMarker);
diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h
index 47df2b4b8..e0fb2829d 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.h
+++ b/plugins/channeltx/modnfm/nfmmodgui.h
@@ -55,7 +55,7 @@ public:
     static const QString m_channelID;
 
 private slots:
-    void viewChanged();
+    void channelMarkerChanged();
     void handleSourceMessages();
 
     void on_deltaFrequency_changed(qint64 value);
diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp
index b3f63d49d..425f8aad1 100644
--- a/plugins/channeltx/modssb/ssbmodgui.cpp
+++ b/plugins/channeltx/modssb/ssbmodgui.cpp
@@ -228,7 +228,7 @@ bool SSBModGUI::handleMessage(const Message& message)
     }
 }
 
-void SSBModGUI::viewChanged()
+void SSBModGUI::channelMarkerChanged()
 {
 	applySettings();
 }
@@ -568,7 +568,7 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
 	m_channelMarker.setCenterFrequency(0);
 	m_channelMarker.setVisible(true);
 
-	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
+	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
 
 	m_deviceAPI->registerChannelInstance(m_channelID, this);
     m_deviceAPI->addChannelMarker(&m_channelMarker);
diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h
index eceb0642b..647ef1f46 100644
--- a/plugins/channeltx/modssb/ssbmodgui.h
+++ b/plugins/channeltx/modssb/ssbmodgui.h
@@ -58,7 +58,7 @@ public:
     static const QString m_channelID;
 
 private slots:
-    void viewChanged();
+    void channelMarkerChanged();
     void handleSourceMessages();
 
     void on_deltaFrequency_changed(qint64 value);
diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp
index 0bc931cd2..7a7fdebed 100644
--- a/plugins/channeltx/modwfm/wfmmod.cpp
+++ b/plugins/channeltx/modwfm/wfmmod.cpp
@@ -26,7 +26,6 @@
 #include "wfmmod.h"
 
 MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureWFMMod, Message)
-MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureWFMModPrivate, Message)
 MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureFileSourceName, Message)
 MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureFileSourceSeek, Message)
 MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureAFInput, Message)
@@ -89,19 +88,6 @@ WFMMod::~WFMMod()
     DSPEngine::instance()->removeAudioSource(&m_audioFifo);
 }
 
-void WFMMod::configure(MessageQueue* messageQueue,
-		Real rfBandwidth,
-		Real afBandwidth,
-		float fmDeviation,
-		float toneFrequency,
-		float volumeFactor,
-		bool channelMute,
-		bool playLoop)
-{
-	Message* cmd = MsgConfigureWFMModPrivate::create(rfBandwidth, afBandwidth, fmDeviation, toneFrequency, volumeFactor, channelMute, playLoop);
-	messageQueue->push(cmd);
-}
-
 void WFMMod::pull(Sample& sample)
 {
 	if (m_settings.m_channelMute)
diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h
index 6d592f9fa..15bcb62c1 100644
--- a/plugins/channeltx/modwfm/wfmmod.h
+++ b/plugins/channeltx/modwfm/wfmmod.h
@@ -202,15 +202,6 @@ public:
     WFMMod();
     ~WFMMod();
 
-    void configure(MessageQueue* messageQueue,
-            Real rfBandwidth,
-            Real afBandwidth,
-            float fmDeviation,
-            float toneFrequency,
-			float volumeFactor,
-            bool audioMute,
-            bool playLoop);
-
     virtual void pull(Sample& sample);
     virtual void pullAudio(int nbSamples);
     virtual void start();
@@ -232,65 +223,6 @@ signals:
 
 
 private:
-    class MsgConfigureWFMModPrivate : public Message
-    {
-        MESSAGE_CLASS_DECLARATION
-
-    public:
-        Real getRFBandwidth() const { return m_rfBandwidth; }
-        Real getAFBandwidth() const { return m_afBandwidth; }
-        float getFMDeviation() const { return m_fmDeviation; }
-        float getToneFrequency() const { return m_toneFrequency; }
-        float getVolumeFactor() const { return m_volumeFactor; }
-        bool getChannelMute() const { return m_channelMute; }
-        bool getPlayLoop() const { return m_playLoop; }
-
-        static MsgConfigureWFMModPrivate* create(Real rfBandwidth,
-        		Real afBandwidth,
-				float fmDeviation,
-				float toneFrequency,
-				float volumeFactor,
-				bool channelMute,
-				bool playLoop)
-        {
-            return new MsgConfigureWFMModPrivate(rfBandwidth,
-            		afBandwidth,
-					fmDeviation,
-					toneFrequency,
-					volumeFactor,
-					channelMute,
-					playLoop);
-        }
-
-    private:
-        Real m_rfBandwidth;
-        Real m_afBandwidth;
-        float m_fmDeviation;
-        float m_toneFrequency;
-        float m_volumeFactor;
-        bool m_channelMute;
-        bool m_playLoop;
-
-        MsgConfigureWFMModPrivate(Real rfBandwidth,
-        		Real afBandwidth,
-				float fmDeviation,
-				float toneFrequency,
-				float volumeFactor,
-				bool channelMute,
-				bool playLoop) :
-            Message(),
-            m_rfBandwidth(rfBandwidth),
-            m_afBandwidth(afBandwidth),
-            m_fmDeviation(fmDeviation),
-            m_toneFrequency(toneFrequency),
-            m_volumeFactor(volumeFactor),
-            m_channelMute(channelMute),
-			m_playLoop(playLoop)
-        { }
-    };
-
-    //=================================================================
-
     enum RateState {
         RSInitialFill,
         RSRunning
diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp
index 236bf8587..b1af2bfb9 100644
--- a/plugins/channeltx/modwfm/wfmmodgui.cpp
+++ b/plugins/channeltx/modwfm/wfmmodgui.cpp
@@ -111,7 +111,7 @@ bool WFMModGUI::handleMessage(const Message& message)
     }
 }
 
-void WFMModGUI::viewChanged()
+void WFMModGUI::channelMarkerChanged()
 {
 	applySettings();
 }
@@ -327,7 +327,7 @@ WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
     m_channelMarker.setTitle("WFM Modulator");
     m_channelMarker.setVisible(true);
 
-	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
+	connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
 
 	m_deviceAPI->registerChannelInstance(m_channelID, this);
     m_deviceAPI->addChannelMarker(&m_channelMarker);
diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h
index 10854f062..38f7e28a4 100644
--- a/plugins/channeltx/modwfm/wfmmodgui.h
+++ b/plugins/channeltx/modwfm/wfmmodgui.h
@@ -58,7 +58,7 @@ public:
     static const QString m_channelID;
 
 private slots:
-    void viewChanged();
+    void channelMarkerChanged();
     void handleSourceMessages();
 
     void on_deltaFrequency_changed(qint64 value);