diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp
index aa913e372..17f0ceee4 100644
--- a/plugins/channeltx/modam/ammodplugin.cpp
+++ b/plugins/channeltx/modam/ammodplugin.cpp
@@ -50,15 +50,9 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerTxChannel(AMMod::m_channelIdURI, AMMod::m_channelId, this);
 }
 
-PluginInstanceGUI* AMModPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
+PluginInstanceGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
-	if(channelName == AMMod::m_channelIdURI)
-	{
-		AMModGUI* gui = AMModGUI::create(m_pluginAPI, deviceUISet, txChannel);
-		return gui;
-	} else {
-		return 0;
-	}
+	return AMModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
 
 BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h
index da4d0f000..a024911bd 100644
--- a/plugins/channeltx/modam/ammodplugin.h
+++ b/plugins/channeltx/modam/ammodplugin.h
@@ -34,7 +34,7 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
+	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
 	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp
index 8764e9698..00517f725 100644
--- a/plugins/channeltx/modatv/atvmodplugin.cpp
+++ b/plugins/channeltx/modatv/atvmodplugin.cpp
@@ -50,15 +50,9 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(ATVMod::m_channelIdURI, ATVMod::m_channelId, this);
 }
 
-PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
+PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
-    if(channelName == ATVMod::m_channelIdURI)
-    {
-        ATVModGUI* gui = ATVModGUI::create(m_pluginAPI, deviceUISet, txChannel);
-        return gui;
-    } else {
-        return 0;
-    }
+    return ATVModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
 
 BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h
index 4ad8ddbe9..c1e9c4a5b 100644
--- a/plugins/channeltx/modatv/atvmodplugin.h
+++ b/plugins/channeltx/modatv/atvmodplugin.h
@@ -34,7 +34,7 @@ public:
     const PluginDescriptor& getPluginDescriptor() const;
     void initPlugin(PluginAPI* pluginAPI);
 
-    virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
+    virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
     virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
     virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp
index 1c6ea224d..62b3f9560 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.cpp
+++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp
@@ -51,22 +51,15 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 
 #ifdef SERVER_MODE
 PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(
-        const QString& channelName __attribute__((unused)),
         DeviceUISet *deviceUISet __attribute__((unused)),
         BasebandSampleSource *txChannel __attribute__((unused)))
 {
     return 0;
 }
 #else
-PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
+PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
-	if(channelName == NFMMod::m_channelIdURI)
-	{
-	    NFMModGUI* gui = NFMModGUI::create(m_pluginAPI, deviceUISet, txChannel);
-		return gui;
-	} else {
-		return 0;
-	}
+    return NFMModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
 #endif
 
diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h
index b1bc4557e..e200bb7de 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.h
+++ b/plugins/channeltx/modnfm/nfmmodplugin.h
@@ -34,7 +34,7 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel);
+	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel);
     virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
     virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp
index dfd6bf207..4a59ae003 100644
--- a/plugins/channeltx/modssb/ssbmodplugin.cpp
+++ b/plugins/channeltx/modssb/ssbmodplugin.cpp
@@ -50,15 +50,9 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(SSBMod::m_channelIdURI, SSBMod::m_channelId, this);
 }
 
-PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
+PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
-    if(channelName == SSBMod::m_channelIdURI)
-	{
-	    SSBModGUI* gui = SSBModGUI::create(m_pluginAPI, deviceUISet, txChannel);
-		return gui;
-	} else {
-		return 0;
-	}
+    return SSBModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
 
 BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h
index 1f7c896bd..a2fc1665e 100644
--- a/plugins/channeltx/modssb/ssbmodplugin.h
+++ b/plugins/channeltx/modssb/ssbmodplugin.h
@@ -34,7 +34,7 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
+	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
 	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp
index 37b4d71d6..9bb81cb31 100644
--- a/plugins/channeltx/modwfm/wfmmodplugin.cpp
+++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp
@@ -50,15 +50,9 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerTxChannel(WFMMod::m_channelIdURI, WFMMod::m_channelId, this);
 }
 
-PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
+PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
-	if(channelName == WFMMod::m_channelIdURI)
-	{
-	    WFMModGUI* gui = WFMModGUI::create(m_pluginAPI, deviceUISet, txChannel);
-		return gui;
-	} else {
-		return 0;
-	}
+    return WFMModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
 
 BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h
index 332cd5eff..eca98c88b 100644
--- a/plugins/channeltx/modwfm/wfmmodplugin.h
+++ b/plugins/channeltx/modwfm/wfmmodplugin.h
@@ -33,7 +33,7 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
+	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
 	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
diff --git a/plugins/channeltx/udpsink/udpsinkplugin.cpp b/plugins/channeltx/udpsink/udpsinkplugin.cpp
index 3fb5b1fda..37b085c23 100644
--- a/plugins/channeltx/udpsink/udpsinkplugin.cpp
+++ b/plugins/channeltx/udpsink/udpsinkplugin.cpp
@@ -50,17 +50,9 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(UDPSink::m_channelIdURI, UDPSink::m_channelId, this);
 }
 
-PluginInstanceGUI* UDPSinkPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
+PluginInstanceGUI* UDPSinkPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
-    if(channelName == UDPSink::m_channelIdURI)
-	{
-	    UDPSinkGUI* gui = UDPSinkGUI::create(m_pluginAPI, deviceUISet, txChannel);
-//		deviceAPI->registerChannelInstance("sdrangel.channel.udpsrc", gui);
-//		m_pluginAPI->addChannelRollup(gui);
-		return gui;
-	} else {
-		return 0;
-	}
+    return UDPSinkGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
 
 BasebandSampleSource* UDPSinkPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
diff --git a/plugins/channeltx/udpsink/udpsinkplugin.h b/plugins/channeltx/udpsink/udpsinkplugin.h
index d41cc5da1..2932f7055 100644
--- a/plugins/channeltx/udpsink/udpsinkplugin.h
+++ b/plugins/channeltx/udpsink/udpsinkplugin.h
@@ -35,7 +35,7 @@ public:
 	const PluginDescriptor& getPluginDescriptor() const;
 	void initPlugin(PluginAPI* pluginAPI);
 
-	virtual PluginInstanceGUI* createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
+	virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel);
 	virtual BasebandSampleSource* createTxChannelBS(DeviceSinkAPI *deviceAPI);
 	virtual ChannelSourceAPI* createTxChannelCS(DeviceSinkAPI *deviceAPI);
 
diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h
index 1601be112..fdcaccda6 100644
--- a/sdrbase/plugin/plugininterface.h
+++ b/sdrbase/plugin/plugininterface.h
@@ -94,7 +94,6 @@ public:
     // channel Tx plugins
 
 	virtual PluginInstanceGUI* createTxChannelGUI(
-	        const QString& channelName __attribute__((unused)),
 	        DeviceUISet *deviceUISet __attribute__((unused)),
 	        BasebandSampleSource *txChannel __attribute__((unused)))
 	{ return 0; }
diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index 774c5eaa0..a78b93bf7 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -194,6 +194,6 @@ void PluginManager::createTxChannelInstance(int channelPluginIndex, DeviceUISet
     {
         PluginInterface *pluginInterface = m_txChannelRegistrations[channelPluginIndex].m_plugin;
         BasebandSampleSource *txChannel = pluginInterface->createTxChannelBS(deviceAPI);
-        pluginInterface->createTxChannelGUI(m_txChannelRegistrations[channelPluginIndex].m_channelIdURI, deviceUISet, txChannel);
+        pluginInterface->createTxChannelGUI(deviceUISet, txChannel);
     }
 }
diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp
index ee2d38061..83aa1b7bb 100644
--- a/sdrgui/device/deviceuiset.cpp
+++ b/sdrgui/device/deviceuiset.cpp
@@ -176,10 +176,10 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
                     if((*channelRegistrations)[i].m_channelIdURI == channelConfig.m_channelIdURI)
                     {
                         qDebug("DeviceUISet::loadChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channelIdURI));
-                        BasebandSampleSink *rxChannel
-                            = (*channelRegistrations)[i].m_plugin->createRxChannelBS(m_deviceSourceAPI);
-                        PluginInstanceGUI *rxChannelGUI
-                            = (*channelRegistrations)[i].m_plugin->createRxChannelGUI(this, rxChannel);
+                        BasebandSampleSink *rxChannel =
+                                (*channelRegistrations)[i].m_plugin->createRxChannelBS(m_deviceSourceAPI);
+                        PluginInstanceGUI *rxChannelGUI =
+                                (*channelRegistrations)[i].m_plugin->createRxChannelGUI(this, rxChannel);
                         reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, rxChannelGUI);
                         break;
                     }
@@ -274,9 +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(m_deviceSinkAPI);
-                        PluginInstanceGUI *txChannelGUI = (*channelRegistrations)[i].m_plugin->createTxChannelGUI(
-                                channelConfig.m_channelIdURI, this, txChannel);
+                        BasebandSampleSource *txChannel =
+                                (*channelRegistrations)[i].m_plugin->createTxChannelBS(m_deviceSinkAPI);
+                        PluginInstanceGUI *txChannelGUI =
+                                (*channelRegistrations)[i].m_plugin->createTxChannelGUI(this, txChannel);
                         reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, txChannelGUI);
                         break;
                     }