diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp
index 2c69548e2..aa913e372 100644
--- a/plugins/channeltx/modam/ammodplugin.cpp
+++ b/plugins/channeltx/modam/ammodplugin.cpp
@@ -61,15 +61,9 @@ PluginInstanceGUI* AMModPlugin::createTxChannelGUI(const QString& channelName, D
 	}
 }
 
-BasebandSampleSource* AMModPlugin::createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI)
+BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {
-    if(channelName == AMMod::m_channelIdURI)
-    {
-        AMMod* source = new AMMod(deviceAPI);
-        return source;
-    } else {
-        return 0;
-    }
+    return new AMMod(deviceAPI);
 }
 
 ChannelSourceAPI* AMModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h
index 1220d3d14..da4d0f000 100644
--- a/plugins/channeltx/modam/ammodplugin.h
+++ b/plugins/channeltx/modam/ammodplugin.h
@@ -35,7 +35,7 @@ public:
 	void initPlugin(PluginAPI* pluginAPI);
 
 	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
-	virtual BasebandSampleSource* createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI);
+	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
 private:
diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp
index 95e1216d7..8764e9698 100644
--- a/plugins/channeltx/modatv/atvmodplugin.cpp
+++ b/plugins/channeltx/modatv/atvmodplugin.cpp
@@ -61,15 +61,9 @@ PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(const QString& channelName,
     }
 }
 
-BasebandSampleSource* ATVModPlugin::createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI)
+BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {
-    if(channelName == ATVMod::m_channelIdURI)
-    {
-        ATVMod* source = new ATVMod(deviceAPI);
-        return source;
-    } else {
-        return 0;
-    }
+    return new ATVMod(deviceAPI);
 }
 
 ChannelSourceAPI* ATVModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h
index 7e27a0bdb..4ad8ddbe9 100644
--- a/plugins/channeltx/modatv/atvmodplugin.h
+++ b/plugins/channeltx/modatv/atvmodplugin.h
@@ -35,7 +35,7 @@ public:
     void initPlugin(PluginAPI* pluginAPI);
 
     virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
-    virtual BasebandSampleSource* createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI);
+    virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
     virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
 private:
diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp
index b7a9ba510..1c6ea224d 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.cpp
+++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp
@@ -70,15 +70,9 @@ PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(const QString& channelName,
 }
 #endif
 
-BasebandSampleSource* NFMModPlugin::createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI)
+BasebandSampleSource* NFMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {
-    if(channelName == NFMMod::m_channelIdURI)
-    {
-        NFMMod* source = new NFMMod(deviceAPI);
-        return source;
-    } else {
-        return 0;
-    }
+    return new NFMMod(deviceAPI);
 }
 
 ChannelSourceAPI* NFMModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h
index 691306669..b1bc4557e 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.h
+++ b/plugins/channeltx/modnfm/nfmmodplugin.h
@@ -35,7 +35,7 @@ public:
 	void initPlugin(PluginAPI* pluginAPI);
 
 	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel);
-    virtual BasebandSampleSource* createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI);
+    virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
     virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
 private:
diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp
index 327c94f5f..dfd6bf207 100644
--- a/plugins/channeltx/modssb/ssbmodplugin.cpp
+++ b/plugins/channeltx/modssb/ssbmodplugin.cpp
@@ -61,15 +61,9 @@ PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(const QString& channelName,
 	}
 }
 
-BasebandSampleSource* SSBModPlugin::createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI)
+BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {
-    if(channelName == SSBMod::m_channelIdURI)
-    {
-        SSBMod* source = new SSBMod(deviceAPI);
-        return source;
-    } else {
-        return 0;
-    }
+    return new SSBMod(deviceAPI);
 }
 
 ChannelSourceAPI* SSBModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h
index 6ed2d0027..1f7c896bd 100644
--- a/plugins/channeltx/modssb/ssbmodplugin.h
+++ b/plugins/channeltx/modssb/ssbmodplugin.h
@@ -35,7 +35,7 @@ public:
 	void initPlugin(PluginAPI* pluginAPI);
 
 	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
-	virtual BasebandSampleSource* createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI);
+	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
 private:
diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp
index 47ec2b70c..37b4d71d6 100644
--- a/plugins/channeltx/modwfm/wfmmodplugin.cpp
+++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp
@@ -61,15 +61,9 @@ PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(const QString& channelName,
 	}
 }
 
-BasebandSampleSource* WFMModPlugin::createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI)
+BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {
-    if(channelName == WFMMod::m_channelIdURI)
-    {
-        WFMMod* source = new WFMMod(deviceAPI);
-        return source;
-    } else {
-        return 0;
-    }
+    return new WFMMod(deviceAPI);
 }
 
 ChannelSourceAPI* WFMModPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h
index 2c8e10ad1..332cd5eff 100644
--- a/plugins/channeltx/modwfm/wfmmodplugin.h
+++ b/plugins/channeltx/modwfm/wfmmodplugin.h
@@ -34,7 +34,7 @@ public:
 	void initPlugin(PluginAPI* pluginAPI);
 
 	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
-	virtual BasebandSampleSource* createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI);
+	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
 private:
diff --git a/plugins/channeltx/udpsink/udpsinkplugin.cpp b/plugins/channeltx/udpsink/udpsinkplugin.cpp
index 9f3853137..3fb5b1fda 100644
--- a/plugins/channeltx/udpsink/udpsinkplugin.cpp
+++ b/plugins/channeltx/udpsink/udpsinkplugin.cpp
@@ -63,15 +63,9 @@ PluginInstanceGUI* UDPSinkPlugin::createTxChannelGUI(const QString& channelName,
 	}
 }
 
-BasebandSampleSource* UDPSinkPlugin::createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI)
+BasebandSampleSource* UDPSinkPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {
-    if(channelName == UDPSink::m_channelIdURI)
-    {
-        UDPSink* source = new UDPSink(deviceAPI);
-        return source;
-    } else {
-        return 0;
-    }
+    return new UDPSink(deviceAPI);
 }
 
 ChannelSourceAPI* UDPSinkPlugin::createTxChannelCS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/udpsink/udpsinkplugin.h b/plugins/channeltx/udpsink/udpsinkplugin.h
index 9f5d9c1dc..d41cc5da1 100644
--- a/plugins/channeltx/udpsink/udpsinkplugin.h
+++ b/plugins/channeltx/udpsink/udpsinkplugin.h
@@ -36,7 +36,7 @@ public:
 	void initPlugin(PluginAPI* pluginAPI);
 
 	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
-	virtual BasebandSampleSource* createTxChannelBS(const QString& channelName, DeviceSinkAPI *deviceAPI);
+	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
 private:
diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h
index f029ae295..e0c9fa45c 100644
--- a/sdrbase/plugin/plugininterface.h
+++ b/sdrbase/plugin/plugininterface.h
@@ -101,7 +101,6 @@ public:
 	{ return 0; }
 
     virtual BasebandSampleSource* createTxChannelBS(
-            const QString& channelName __attribute__((unused)),
             DeviceSinkAPI *deviceAPI __attribute__((unused)) )
     { return 0; }
 
diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index aa0386607..367fca05f 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -193,8 +193,7 @@ void PluginManager::createTxChannelInstance(int channelPluginIndex, DeviceUISet
     if (channelPluginIndex < m_txChannelRegistrations.size())
     {
         PluginInterface *pluginInterface = m_txChannelRegistrations[channelPluginIndex].m_plugin;
-        BasebandSampleSource *txChannel = pluginInterface->createTxChannelBS(
-                m_txChannelRegistrations[channelPluginIndex].m_channelIdURI, deviceAPI);
+        BasebandSampleSource *txChannel = pluginInterface->createTxChannelBS(deviceAPI);
         pluginInterface->createTxChannelGUI(m_txChannelRegistrations[channelPluginIndex].m_channelIdURI, deviceUISet, txChannel);
     }
 }
diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp
index 232bc3548..52ae22354 100644
--- a/sdrgui/device/deviceuiset.cpp
+++ b/sdrgui/device/deviceuiset.cpp
@@ -274,12 +274,10 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
                     if((*channelRegistrations)[i].m_channelIdURI == channelConfig.m_channelIdURI)
                     {
                         qDebug("DeviceUISet::loadChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channelIdURI));
-                        BasebandSampleSource *txChannel = (*channelRegistrations)[i].m_plugin->createTxChannelBS(
-                                channelConfig.m_channelIdURI, m_deviceSinkAPI);
+                        BasebandSampleSource *txChannel = (*channelRegistrations)[i].m_plugin->createTxChannelBS(m_deviceSinkAPI);
                         PluginInstanceGUI *txChannelGUI = (*channelRegistrations)[i].m_plugin->createTxChannelGUI(
                                 channelConfig.m_channelIdURI, this, txChannel);
-                        reg = ChannelInstanceRegistration(
-                                channelConfig.m_channelIdURI, txChannelGUI);
+                        reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, txChannelGUI);
                         break;
                     }
                 }