diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp
index acf8c20c5..736fe10b9 100644
--- a/plugins/samplesource/airspy/airspygui.cpp
+++ b/plugins/samplesource/airspy/airspygui.cpp
@@ -31,17 +31,16 @@
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 
-AirspyGui::AirspyGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::AirspyGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_forceSettings(true),
 	m_settings(),
 	m_sampleSource(0),
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
-    m_sampleSource = (AirspyInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -343,15 +342,15 @@ void AirspyGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -389,7 +388,7 @@ void AirspyGui::updateHardware()
 
 void AirspyGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -406,7 +405,7 @@ void AirspyGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h
index 28f2f62b0..29deed649 100644
--- a/plugins/samplesource/airspy/airspygui.h
+++ b/plugins/samplesource/airspy/airspygui.h
@@ -38,7 +38,7 @@ class AirspyGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit AirspyGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit AirspyGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~AirspyGui();
 	virtual void destroy();
 
@@ -58,7 +58,6 @@ public:
 private:
 	Ui::AirspyGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	bool m_forceSettings;
 	AirspySettings m_settings;
diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp
index b354073b9..50ab53496 100644
--- a/plugins/samplesource/airspy/airspyplugin.cpp
+++ b/plugins/samplesource/airspy/airspyplugin.cpp
@@ -122,12 +122,11 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
 PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if (sourceId == m_deviceTypeID)
 	{
-		AirspyGui* gui = new AirspyGui(deviceAPI, deviceUISet);
+		AirspyGui* gui = new AirspyGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h
index 6a2562f56..62953fa9a 100644
--- a/plugins/samplesource/airspy/airspyplugin.h
+++ b/plugins/samplesource/airspy/airspyplugin.h
@@ -39,7 +39,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
index 7a14464ae..ef205e89f 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
@@ -29,10 +29,9 @@
 #include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
 
-BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+BladerfInputGui::BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::BladerfInputGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_forceSettings(true),
 	m_settings(),
@@ -40,7 +39,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *device
 	m_sampleRate(0),
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
-    m_sampleSource = (BladerfInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (BladerfInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
 	ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -335,15 +334,15 @@ void BladerfInputGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -371,7 +370,7 @@ void BladerfInputGui::updateHardware()
 
 void BladerfInputGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -388,7 +387,7 @@ void BladerfInputGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.h b/plugins/samplesource/bladerfinput/bladerfinputgui.h
index 2289a71ac..1aa1cb8f3 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputgui.h
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.h
@@ -36,7 +36,7 @@ class BladerfInputGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~BladerfInputGui();
 	virtual void destroy();
 
@@ -54,7 +54,6 @@ public:
 private:
 	Ui::BladerfInputGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	bool m_forceSettings;
 	BladeRFInputSettings m_settings;
diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
index d87c3f81c..a39bbe668 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
@@ -81,12 +81,11 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
 PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == m_deviceTypeID)
 	{
-		BladerfInputGui* gui = new BladerfInputGui(deviceAPI, deviceUISet);
+		BladerfInputGui* gui = new BladerfInputGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.h b/plugins/samplesource/bladerfinput/bladerfinputplugin.h
index 0b9fa6788..d9fcb6599 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputplugin.h
+++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.h
@@ -41,7 +41,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp
index f4c253b00..a905dd679 100644
--- a/plugins/samplesource/fcdpro/fcdprogui.cpp
+++ b/plugins/samplesource/fcdpro/fcdprogui.cpp
@@ -28,17 +28,16 @@
 #include "fcdproconst.h"
 #include "fcdtraits.h"
 
-FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::FCDProGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_forceSettings(true),
 	m_settings(),
 	m_sampleSource(NULL),
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
-    m_sampleSource = (FCDProInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
 	ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -438,15 +437,15 @@ void FCDProGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -475,7 +474,7 @@ void FCDProGui::on_transverter_clicked()
 
 void FCDProGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -492,7 +491,7 @@ void FCDProGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h
index 4f550f2b1..3e278dc54 100644
--- a/plugins/samplesource/fcdpro/fcdprogui.h
+++ b/plugins/samplesource/fcdpro/fcdprogui.h
@@ -37,7 +37,7 @@ class FCDProGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit FCDProGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit FCDProGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~FCDProGui();
 	virtual void destroy();
 
@@ -55,7 +55,6 @@ public:
 private:
 	Ui::FCDProGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	bool m_forceSettings;
 	FCDProSettings m_settings;
diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp
index 0f09edda8..f2a52049b 100644
--- a/plugins/samplesource/fcdpro/fcdproplugin.cpp
+++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp
@@ -77,12 +77,11 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
 PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == fcd_traits<Pro>::interfaceIID)
 	{
-		FCDProGui* gui = new FCDProGui(deviceAPI, deviceUISet);
+		FCDProGui* gui = new FCDProGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/fcdpro/fcdproplugin.h b/plugins/samplesource/fcdpro/fcdproplugin.h
index 7cafa54c0..a6769bda7 100644
--- a/plugins/samplesource/fcdpro/fcdproplugin.h
+++ b/plugins/samplesource/fcdpro/fcdproplugin.h
@@ -23,7 +23,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
index 9893d03d4..76dd6458f 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
@@ -29,17 +29,16 @@
 #include "fcdproplusconst.h"
 #include "fcdtraits.h"
 
-FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::FCDProPlusGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_forceSettings(true),
 	m_settings(),
 	m_sampleSource(NULL),
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
-    m_sampleSource = (FCDProPlusInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
 	ui->setupUi(this);
 
@@ -228,7 +227,7 @@ void FCDProPlusGui::updateHardware()
 
 void FCDProPlusGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -245,7 +244,7 @@ void FCDProPlusGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
@@ -303,15 +302,15 @@ void FCDProPlusGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h
index 9ba7870b3..fff755603 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusgui.h
+++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h
@@ -36,7 +36,7 @@ class FCDProPlusGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit FCDProPlusGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~FCDProPlusGui();
 	virtual void destroy();
 
@@ -54,7 +54,6 @@ public:
 private:
 	Ui::FCDProPlusGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	bool m_forceSettings;
 	FCDProPlusSettings m_settings;
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
index 26b9c5c3c..4f3a075ef 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
@@ -79,12 +79,11 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
 PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == fcd_traits<ProPlus>::interfaceIID)
 	{
-		FCDProPlusGui* gui = new FCDProPlusGui(deviceAPI, deviceUISet);
+		FCDProPlusGui* gui = new FCDProPlusGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h
index 918274e40..c82921e13 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h
@@ -23,7 +23,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp
index 27f877e86..8f157db36 100644
--- a/plugins/samplesource/filesource/filesourcegui.cpp
+++ b/plugins/samplesource/filesource/filesourcegui.cpp
@@ -35,10 +35,9 @@
 #include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
 
-FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::FileSourceGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_settings(),
 	m_sampleSource(NULL),
@@ -58,7 +57,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISe
 	ui->centerFrequency->setValueRange(7, 0, pow(10,7));
 	ui->fileNameText->setText(m_fileName);
 
-	connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
+	connect(&(m_deviceUISet->m_deviceSourceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	m_statusTimer.start(500);
 
@@ -68,7 +67,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISe
 	ui->playLoop->setChecked(true); // FIXME: always play in a loop
 	ui->playLoop->setEnabled(false);
 
-    m_sampleSource = m_deviceAPI->getSampleSource();
+    m_sampleSource = m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
 }
@@ -210,22 +209,22 @@ void FileSourceGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
 
 void FileSourceGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -242,7 +241,7 @@ void FileSourceGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/filesource/filesourcegui.h b/plugins/samplesource/filesource/filesourcegui.h
index 7597e8ab3..ead6d3670 100644
--- a/plugins/samplesource/filesource/filesourcegui.h
+++ b/plugins/samplesource/filesource/filesourcegui.h
@@ -36,7 +36,7 @@ class FileSourceGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit FileSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~FileSourceGui();
 	virtual void destroy();
 
@@ -54,7 +54,6 @@ public:
 private:
 	Ui::FileSourceGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	FileSourceInput::Settings m_settings;
 	QTimer m_statusTimer;
diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp
index 71c258999..21c871f66 100644
--- a/plugins/samplesource/filesource/filesourceplugin.cpp
+++ b/plugins/samplesource/filesource/filesourceplugin.cpp
@@ -72,12 +72,11 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
 PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == m_deviceTypeID)
 	{
-		FileSourceGui* gui = new FileSourceGui(deviceAPI, deviceUISet);
+		FileSourceGui* gui = new FileSourceGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/filesource/filesourceplugin.h b/plugins/samplesource/filesource/filesourceplugin.h
index 222b0968f..2f077ce1c 100644
--- a/plugins/samplesource/filesource/filesourceplugin.h
+++ b/plugins/samplesource/filesource/filesourceplugin.h
@@ -39,7 +39,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
index dcd99b200..d790eb4bd 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
@@ -32,17 +32,16 @@
 
 #include "ui_hackrfinputgui.h"
 
-HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::HackRFInputGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_settings(),
 	m_forceSettings(true),
 	m_sampleSource(NULL),
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
-    m_sampleSource = (HackRFInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -332,21 +331,21 @@ void HackRFInputGui::on_startStop_toggled(bool checked)
     if (checked)
     {
         // forcibly stop the Tx if present before starting
-        if (m_deviceAPI->getSinkBuddies().size() > 0)
+        if (m_deviceUISet->m_deviceSourceAPI->getSinkBuddies().size() > 0)
         {
-            DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0];
+            DeviceSinkAPI *buddy = m_deviceUISet->m_deviceSourceAPI->getSinkBuddies()[0];
             buddy->stopGeneration();
         }
 
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -374,7 +373,7 @@ void HackRFInputGui::updateHardware()
 
 void HackRFInputGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -392,7 +391,7 @@ void HackRFInputGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h
index 2c6c28ad9..f0ea24702 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.h
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h
@@ -46,7 +46,7 @@ public:
 		HACKRF_IMGREJ_NB
 	} HackRFImgRejValue;
 
-	explicit HackRFInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~HackRFInputGui();
 	virtual void destroy();
 
@@ -64,7 +64,6 @@ public:
 private:
 	Ui::HackRFInputGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	HackRFInputSettings m_settings;
 	bool m_forceSettings;
diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
index d0b49125a..1a8cca807 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
@@ -120,12 +120,11 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
 PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == m_deviceTypeID)
 	{
-		HackRFInputGui* gui = new HackRFInputGui(deviceAPI, deviceUISet);
+		HackRFInputGui* gui = new HackRFInputGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.h b/plugins/samplesource/hackrfinput/hackrfinputplugin.h
index b78559365..1a90c44e4 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputplugin.h
+++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.h
@@ -39,7 +39,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
index 1fa3da8f9..c5ee62509 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
@@ -29,10 +29,9 @@
 #include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 
-LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::LimeSDRInputGUI),
-    m_deviceAPI(deviceAPI),
     m_deviceUISet(deviceUISet),
     m_settings(),
     m_sampleRate(0),
@@ -42,7 +41,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, DeviceUISet *device
     m_statusCounter(0),
     m_deviceStatusCounter(0)
 {
-    m_limeSDRInput = (LimeSDRInput*) m_deviceAPI->getSampleSource();
+    m_limeSDRInput = (LimeSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     ui->setupUi(this);
 
@@ -331,7 +330,7 @@ void LimeSDRInputGUI::updateHardware()
 
 void LimeSDRInputGUI::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -348,7 +347,7 @@ void LimeSDRInputGUI::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
@@ -374,7 +373,7 @@ void LimeSDRInputGUI::updateStatus()
     }
     else
     {
-        if (m_deviceAPI->isBuddyLeader())
+        if (m_deviceUISet->m_deviceSourceAPI->isBuddyLeader())
         {
             LimeSDRInput::MsgGetDeviceInfo* message = LimeSDRInput::MsgGetDeviceInfo::create();
             m_limeSDRInput->getInputMessageQueue()->push(message);
@@ -393,15 +392,15 @@ void LimeSDRInputGUI::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h
index 6e7296b9d..e1959b2e6 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.h
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h
@@ -36,7 +36,7 @@ class LimeSDRInputGUI : public QWidget, public PluginInstanceGUI {
     Q_OBJECT
 
 public:
-    explicit LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+    explicit LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent = 0);
     virtual ~LimeSDRInputGUI();
     virtual void destroy();
 
@@ -54,7 +54,6 @@ public:
 private:
     Ui::LimeSDRInputGUI* ui;
 
-    DeviceSourceAPI* m_deviceAPI;
     DeviceUISet* m_deviceUISet;
     LimeSDRInput* m_limeSDRInput; //!< Same object as above but gives easy access to LimeSDRInput methods and attributes that are used intensively
     LimeSDRInputSettings m_settings;
diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
index 4ab1d1dbc..130a6cb88 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
@@ -100,12 +100,11 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources()
 PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
     if(sourceId == m_deviceTypeID)
     {
-        LimeSDRInputGUI* gui = new LimeSDRInputGUI(deviceAPI, deviceUISet);
+        LimeSDRInputGUI* gui = new LimeSDRInputGUI(deviceUISet);
         *widget = gui;
         return gui;
     }
diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.h b/plugins/samplesource/limesdrinput/limesdrinputplugin.h
index e9165aac3..bbd975698 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputplugin.h
+++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.h
@@ -39,7 +39,6 @@ public:
     virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
             const QString& sourceId,
             QWidget **widget,
-            DeviceSourceAPI *deviceAPI,
             DeviceUISet *deviceUISet);
     virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
index 21fb9bdcf..bc404d9a0 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
@@ -28,10 +28,9 @@
 #include "ui_plutosdrinputgui.h"
 #include "plutosdrinputgui.h"
 
-PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PlutoSDRInputGUI),
-    m_deviceAPI(deviceAPI),
     m_deviceUISet(deviceUISet),
     m_settings(),
     m_forceSettings(true),
@@ -42,7 +41,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *devi
     m_doApplySettings(true),
     m_statusCounter(0)
 {
-    m_sampleSource = (PlutoSDRInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (PlutoSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     ui->setupUi(this);
     ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -156,15 +155,15 @@ void PlutoSDRInputGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -346,7 +345,7 @@ void PlutoSDRInputGui::blockApplySettings(bool block)
 
 void PlutoSDRInputGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -363,7 +362,7 @@ void PlutoSDRInputGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
@@ -395,7 +394,7 @@ void PlutoSDRInputGui::updateStatus()
 
     if (m_statusCounter % 10 == 0) // 5s
     {
-        if (m_deviceAPI->isBuddyLeader()) {
+        if (m_deviceUISet->m_deviceSourceAPI->isBuddyLeader()) {
             ((PlutoSDRInput *) m_sampleSource)->fetchTemperature();
         }
 
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h
index 636b0dd07..09e52d805 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h
@@ -38,7 +38,7 @@ class PlutoSDRInputGui : public QWidget, public PluginInstanceGUI {
     Q_OBJECT
 
 public:
-    explicit PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+    explicit PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
     virtual ~PlutoSDRInputGui();
 
     virtual void destroy();
@@ -54,7 +54,6 @@ public:
 
 private:
     Ui::PlutoSDRInputGUI* ui;
-    DeviceSourceAPI* m_deviceAPI;
     DeviceUISet* m_deviceUISet;
     PlutoSDRInputSettings m_settings;
     bool m_forceSettings;
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
index f61b710ae..5441fdc2f 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
@@ -84,12 +84,11 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources()
 PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == m_deviceTypeID)
 	{
-		PlutoSDRInputGui* gui = new PlutoSDRInputGui(deviceAPI, deviceUISet);
+		PlutoSDRInputGui* gui = new PlutoSDRInputGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h
index e5c8540df..0587c3c90 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h
@@ -39,7 +39,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index 99bc5b3d5..24789ff21 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -30,17 +30,16 @@
 #include "dsp/dspcommands.h"
 
 
-RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::RTLSDRGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_forceSettings(true),
 	m_settings(),
 	m_sampleSource(0),
 	m_lastEngineState((DSPDeviceSourceEngine::State)-1)
 {
-    m_sampleSource = (RTLSDRInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     ui->setupUi(this);
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -312,15 +311,15 @@ void RTLSDRGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -357,7 +356,7 @@ void RTLSDRGui::updateHardware()
 
 void RTLSDRGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -374,7 +373,7 @@ void RTLSDRGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h
index 20b58ed8d..f596112f0 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h
@@ -37,7 +37,7 @@ class RTLSDRGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit RTLSDRGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~RTLSDRGui();
 	virtual void destroy();
 
@@ -55,7 +55,6 @@ public:
 private:
 	Ui::RTLSDRGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
 	bool m_forceSettings;
 	RTLSDRSettings m_settings;
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
index 85eeb4519..aefe207f9 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
@@ -65,11 +65,10 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
 PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == m_deviceTypeID) {
-		RTLSDRGui* gui = new RTLSDRGui(deviceAPI, deviceUISet);
+		RTLSDRGui* gui = new RTLSDRGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	} else {
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h
index 2119c1ebe..3337bd1d6 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h
@@ -23,7 +23,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
index 1814eaf8e..fc5ed4014 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
@@ -46,10 +46,9 @@
 #include "device/deviceuiset.h"
 #include "sdrdaemonsourcegui.h"
 
-SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceUISet *deviceUISet, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::SDRdaemonSourceGui),
-	m_deviceAPI(deviceAPI),
 	m_deviceUISet(deviceUISet),
 	m_sampleSource(NULL),
 	m_acquisition(false),
@@ -101,10 +100,10 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *
 
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	m_statusTimer.start(500);
-	connect(&(deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
+	connect(&(m_deviceUISet->m_deviceSourceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
     connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
 
-    m_sampleSource = (SDRdaemonSourceInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (SDRdaemonSourceInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
 	displaySettings();
 
@@ -594,15 +593,15 @@ void SDRdaemonSourceGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
@@ -733,7 +732,7 @@ void SDRdaemonSourceGui::updateHardware()
 
 void SDRdaemonSourceGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -750,7 +749,7 @@ void SDRdaemonSourceGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
index d2191f523..d9a038351 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
@@ -37,7 +37,7 @@ class SDRdaemonSourceGui : public QWidget, public PluginInstanceGUI {
 	Q_OBJECT
 
 public:
-	explicit SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+	explicit SDRdaemonSourceGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
 	virtual ~SDRdaemonSourceGui();
 	virtual void destroy();
 
@@ -55,7 +55,6 @@ public:
 private:
 	Ui::SDRdaemonSourceGui* ui;
 
-	DeviceSourceAPI* m_deviceAPI;
 	DeviceUISet* m_deviceUISet;
     SDRdaemonSourceSettings m_settings;        //!< current settings
     SDRdaemonSourceSettings m_controlSettings; //!< settings last sent to device via control port
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
index a64dacafd..abecda134 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
@@ -73,12 +73,11 @@ PluginInterface::SamplingDevices SDRdaemonSourcePlugin::enumSampleSources()
 PluginInstanceGUI* SDRdaemonSourcePlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
 	if(sourceId == m_deviceTypeID)
 	{
-		SDRdaemonSourceGui* gui = new SDRdaemonSourceGui(deviceAPI, deviceUISet);
+		SDRdaemonSourceGui* gui = new SDRdaemonSourceGui(deviceUISet);
 		*widget = gui;
 		return gui;
 	}
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h
index 1fc76fe42..1381ea617 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h
@@ -39,7 +39,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId,
 	        QWidget **widget,
-	        DeviceSourceAPI *deviceAPI,
 	        DeviceUISet *deviceUISet);
 	virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp
index 213b83e0e..790f9a75d 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp
@@ -29,14 +29,13 @@
 #include "dsp/dspcommands.h"
 
 
-SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
+SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::SDRPlayGui),
-    m_deviceAPI(deviceAPI),
     m_deviceUISet(deviceUISet),
     m_forceSettings(true)
 {
-    m_sampleSource = (SDRPlayInput*) m_deviceAPI->getSampleSource();
+    m_sampleSource = (SDRPlayInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
 
     ui->setupUi(this);
     ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -277,7 +276,7 @@ void SDRPlayGui::updateHardware()
 
 void SDRPlayGui::updateStatus()
 {
-    int state = m_deviceAPI->state();
+    int state = m_deviceUISet->m_deviceSourceAPI->state();
 
     if(m_lastEngineState != state)
     {
@@ -294,7 +293,7 @@ void SDRPlayGui::updateStatus()
                 break;
             case DSPDeviceSourceEngine::StError:
                 ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
-                QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
+                QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
                 break;
             default:
                 break;
@@ -436,15 +435,15 @@ void SDRPlayGui::on_startStop_toggled(bool checked)
 {
     if (checked)
     {
-        if (m_deviceAPI->initAcquisition())
+        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
         {
-            m_deviceAPI->startAcquisition();
+            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
             DSPEngine::instance()->startAudioOutput();
         }
     }
     else
     {
-        m_deviceAPI->stopAcquisition();
+        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
         DSPEngine::instance()->stopAudioOutput();
     }
 }
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h
index 8c56b0713..5f1b0ca67 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.h
+++ b/plugins/samplesource/sdrplay/sdrplaygui.h
@@ -39,7 +39,7 @@ class SDRPlayGui : public QWidget, public PluginInstanceGUI {
     Q_OBJECT
 
 public:
-    explicit SDRPlayGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
+    explicit SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
     virtual ~SDRPlayGui();
     virtual void destroy();
 
@@ -57,7 +57,6 @@ public:
 private:
     Ui::SDRPlayGui* ui;
 
-    DeviceSourceAPI* m_deviceAPI;
     DeviceUISet* m_deviceUISet;
     bool m_forceSettings;
     SDRPlaySettings m_settings;
diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp
index 910a7b539..cda7c23d1 100644
--- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp
@@ -86,12 +86,11 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources()
 PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
-        DeviceSourceAPI *deviceAPI,
         DeviceUISet *deviceUISet)
 {
     if(sourceId == m_deviceTypeID)
     {
-        SDRPlayGui* gui = new SDRPlayGui(deviceAPI, deviceUISet);
+        SDRPlayGui* gui = new SDRPlayGui(deviceUISet);
         *widget = gui;
         return gui;
     }
diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.h b/plugins/samplesource/sdrplay/sdrplayplugin.h
index e46a6f363..7f0505548 100644
--- a/plugins/samplesource/sdrplay/sdrplayplugin.h
+++ b/plugins/samplesource/sdrplay/sdrplayplugin.h
@@ -39,7 +39,6 @@ public:
     virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
             const QString& sourceId,
             QWidget **widget,
-            DeviceSourceAPI *deviceAPI,
             DeviceUISet *deviceUISet);
     virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
 
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 77f5f6caf..388a79678 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -154,7 +154,6 @@ MainWindow::MainWindow(QWidget* parent) :
     PluginInstanceGUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI(
             m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(),
             &gui,
-            m_deviceUIs.back()->m_deviceSourceAPI,
             m_deviceUIs.back());
     m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue());
     m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginGUI);
@@ -241,7 +240,6 @@ void MainWindow::addSourceDevice()
     PluginInstanceGUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI(
             m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(),
             &gui,
-            m_deviceUIs.back()->m_deviceSourceAPI,
             m_deviceUIs.back());
     m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue());
     m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginGUI);
@@ -909,7 +907,6 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
         PluginInstanceGUI *pluginUI = deviceUI->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI(
                 deviceUI->m_deviceSourceAPI->getSampleSourceId(),
                 &gui,
-                deviceUI->m_deviceSourceAPI,
                 deviceUI);
         deviceUI->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
         deviceUI->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginUI);
diff --git a/sdrgui/plugin/plugininterface.h b/sdrgui/plugin/plugininterface.h
index 71a5a760e..6c2fd9fe0 100644
--- a/sdrgui/plugin/plugininterface.h
+++ b/sdrgui/plugin/plugininterface.h
@@ -64,7 +64,6 @@ public:
 	virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
 	        const QString& sourceId __attribute__((unused)),
 	        QWidget **widget __attribute__((unused)),
-	        DeviceSourceAPI *deviceAPI __attribute__((unused)),
 	        DeviceUISet *deviceUISet __attribute__((unused)))
 	{ return 0; }