diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp
index 4a3a3487c..e8d9c4964 100644
--- a/plugins/samplesource/airspy/airspyinput.cpp
+++ b/plugins/samplesource/airspy/airspyinput.cpp
@@ -127,7 +127,7 @@ bool AirspyInput::openDevice()
     return true;
 }
 
-bool AirspyInput::start(int device)
+bool AirspyInput::start()
 {
 	QMutexLocker mutexLocker(&m_mutex);
 
diff --git a/plugins/samplesource/airspy/airspyinput.h b/plugins/samplesource/airspy/airspyinput.h
index 7af6f3027..846c3795f 100644
--- a/plugins/samplesource/airspy/airspyinput.h
+++ b/plugins/samplesource/airspy/airspyinput.h
@@ -71,7 +71,7 @@ public:
 	AirspyInput(DeviceSourceAPI *deviceAPI);
 	virtual ~AirspyInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp
index 4c3544155..03ffc0efb 100644
--- a/plugins/samplesource/bladerfinput/bladerfinput.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp
@@ -113,7 +113,7 @@ bool BladerfInput::openDevice()
     return true;
 }
 
-bool BladerfInput::start(int device)
+bool BladerfInput::start()
 {
 //	QMutexLocker mutexLocker(&m_mutex);
 
diff --git a/plugins/samplesource/bladerfinput/bladerfinput.h b/plugins/samplesource/bladerfinput/bladerfinput.h
index eec5c7894..333533d24 100644
--- a/plugins/samplesource/bladerfinput/bladerfinput.h
+++ b/plugins/samplesource/bladerfinput/bladerfinput.h
@@ -71,7 +71,7 @@ public:
 	BladerfInput(DeviceSourceAPI *deviceAPI);
 	virtual ~BladerfInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp
index 9aab8420b..a585e92d2 100644
--- a/plugins/samplesource/fcdpro/fcdproinput.cpp
+++ b/plugins/samplesource/fcdpro/fcdproinput.cpp
@@ -73,7 +73,7 @@ bool FCDProInput::openDevice()
     return true;
 }
 
-bool FCDProInput::start(int device)
+bool FCDProInput::start()
 {
 	qDebug() << "FCDProInput::start";
 
@@ -85,19 +85,6 @@ bool FCDProInput::start(int device)
 
     if (m_running) stop();
 
-//	if (m_FCDThread)
-//	{
-//		return false;
-//	}
-
-//	m_dev = fcdOpen(fcd_traits<Pro>::vendorId, fcd_traits<Pro>::productId, device);
-//
-//	if (m_dev == 0)
-//	{
-//		qCritical("FCDProInput::start: could not open FCD");
-//		return false;
-//	}
-
 	/* Apply settings before streaming to avoid bus contention;
 	 * there is very little spare bandwidth on a full speed USB device.
 	 * Failure is harmless if no device is found
@@ -147,8 +134,6 @@ void FCDProInput::stop()
 	}
 
 	m_running = false;
-//	fcdClose(m_dev);
-//	m_dev = 0;
 }
 
 const QString& FCDProInput::getDeviceDescription() const
diff --git a/plugins/samplesource/fcdpro/fcdproinput.h b/plugins/samplesource/fcdpro/fcdproinput.h
index be4d24e85..c4500cdcf 100644
--- a/plugins/samplesource/fcdpro/fcdproinput.h
+++ b/plugins/samplesource/fcdpro/fcdproinput.h
@@ -58,7 +58,7 @@ public:
 	FCDProInput(DeviceSourceAPI *deviceAPI);
 	virtual ~FCDProInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
index 1878012d0..7d63c2be8 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
@@ -66,7 +66,7 @@ bool FCDProPlusInput::openDevice()
     return true;
 }
 
-bool FCDProPlusInput::start(int device)
+bool FCDProPlusInput::start()
 {
 
 //	QMutexLocker mutexLocker(&m_mutex);
diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.h b/plugins/samplesource/fcdproplus/fcdproplusinput.h
index 7ecec3357..e213aa639 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusinput.h
+++ b/plugins/samplesource/fcdproplus/fcdproplusinput.h
@@ -57,7 +57,7 @@ public:
 	FCDProPlusInput(DeviceSourceAPI *deviceAPI);
 	virtual ~FCDProPlusInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp
index 31e780119..86b9f09f8 100644
--- a/plugins/samplesource/filesource/filesourceinput.cpp
+++ b/plugins/samplesource/filesource/filesourceinput.cpp
@@ -140,7 +140,7 @@ void FileSourceInput::seekFileStream(int seekPercentage)
 	}
 }
 
-bool FileSourceInput::start(int device)
+bool FileSourceInput::start()
 {
 	QMutexLocker mutexLocker(&m_mutex);
 	qDebug() << "FileSourceInput::start";
diff --git a/plugins/samplesource/filesource/filesourceinput.h b/plugins/samplesource/filesource/filesourceinput.h
index b9a2ddf05..d2877319a 100644
--- a/plugins/samplesource/filesource/filesourceinput.h
+++ b/plugins/samplesource/filesource/filesourceinput.h
@@ -212,7 +212,7 @@ public:
 	FileSourceInput(const QTimer& masterTimer);
 	virtual ~FileSourceInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp
index 9c183e3b2..eb6d05706 100644
--- a/plugins/samplesource/hackrfinput/hackrfinput.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp
@@ -99,7 +99,7 @@ bool HackRFInput::openDevice()
     return true;
 }
 
-bool HackRFInput::start(int device)
+bool HackRFInput::start()
 {
 //	QMutexLocker mutexLocker(&m_mutex);
     if (!m_dev) {
diff --git a/plugins/samplesource/hackrfinput/hackrfinput.h b/plugins/samplesource/hackrfinput/hackrfinput.h
index d643a6cc0..c241b649e 100644
--- a/plugins/samplesource/hackrfinput/hackrfinput.h
+++ b/plugins/samplesource/hackrfinput/hackrfinput.h
@@ -71,7 +71,7 @@ public:
 	HackRFInput(DeviceSourceAPI *deviceAPI);
 	virtual ~HackRFInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp
index 1447f2d98..ad267588f 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp
@@ -108,7 +108,7 @@ void LimeSDRInput::closeDevice()
     m_deviceParams.m_dev = 0;
 }
 
-bool LimeSDRInput::start(int device)
+bool LimeSDRInput::start()
 {
     QMutexLocker mutexLocker(&m_mutex);
 
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h
index 647621b08..1c779b84e 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.h
+++ b/plugins/samplesource/limesdrinput/limesdrinput.h
@@ -32,7 +32,7 @@ public:
     LimeSDRInput(DeviceSourceAPI *deviceAPI);
     virtual ~LimeSDRInput();
 
-    virtual bool start(int device);
+    virtual bool start();
     virtual void stop();
 
     virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
index 824bc7271..35a6e54c1 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
@@ -148,7 +148,7 @@ bool RTLSDRInput::openDevice()
     return true;
 }
 
-bool RTLSDRInput::start(int device) // TODO: remove device parameter
+bool RTLSDRInput::start()
 {
 	QMutexLocker mutexLocker(&m_mutex);
 
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.h b/plugins/samplesource/rtlsdr/rtlsdrinput.h
index 2935f944f..42bb765b5 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.h
@@ -87,7 +87,7 @@ public:
 	RTLSDRInput(DeviceSourceAPI *deviceAPI);
 	virtual ~RTLSDRInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp b/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
index cecada936..529ba5b68 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
+++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
@@ -63,7 +63,7 @@ SDRdaemonInput::~SDRdaemonInput()
 	delete m_SDRdaemonUDPHandler;
 }
 
-bool SDRdaemonInput::start(int device)
+bool SDRdaemonInput::start()
 {
 	qDebug() << "SDRdaemonInput::start";
 	MsgConfigureSDRdaemonWork *command = MsgConfigureSDRdaemonWork::create(true);
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h
index f736ba330..bae116e03 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h
+++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h
@@ -277,7 +277,7 @@ public:
 	SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
 	virtual ~SDRdaemonInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
index b459530fe..7390f900f 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
+++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
@@ -61,7 +61,7 @@ SDRdaemonFECInput::~SDRdaemonFECInput()
 	delete m_SDRdaemonUDPHandler;
 }
 
-bool SDRdaemonFECInput::start(int device)
+bool SDRdaemonFECInput::start()
 {
 	qDebug() << "SDRdaemonInput::start";
 	MsgConfigureSDRdaemonWork *command = MsgConfigureSDRdaemonWork::create(true);
diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
index cc4999f0c..39a11c97b 100644
--- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
+++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
@@ -261,7 +261,7 @@ public:
 	SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
 	virtual ~SDRdaemonFECInput();
 
-	virtual bool start(int device);
+	virtual bool start();
 	virtual void stop();
 
 	virtual const QString& getDeviceDescription() const;
diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp
index 29f024722..ac0bf407e 100644
--- a/plugins/samplesource/sdrplay/sdrplayinput.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp
@@ -94,7 +94,7 @@ bool SDRPlayInput::openDevice()
     return true;
 }
 
-bool SDRPlayInput::start(int device)
+bool SDRPlayInput::start()
 {
 //    QMutexLocker mutexLocker(&m_mutex);
     int res;
@@ -213,7 +213,7 @@ bool SDRPlayInput::handleMessage(const Message& message)
         {
             m_settings = settings;
             stop();
-            start(m_devNumber);
+            start();
         }
         // standard changes
         else
diff --git a/plugins/samplesource/sdrplay/sdrplayinput.h b/plugins/samplesource/sdrplay/sdrplayinput.h
index 3c2fd6c20..8a1ffec44 100644
--- a/plugins/samplesource/sdrplay/sdrplayinput.h
+++ b/plugins/samplesource/sdrplay/sdrplayinput.h
@@ -81,7 +81,7 @@ public:
     SDRPlayInput(DeviceSourceAPI *deviceAPI);
     virtual ~SDRPlayInput();
 
-    virtual bool start(int device);
+    virtual bool start();
     virtual void stop();
 
     virtual const QString& getDeviceDescription() const;
diff --git a/sdrbase/dsp/devicesamplesource.h b/sdrbase/dsp/devicesamplesource.h
index f87d5173c..0594deaa3 100644
--- a/sdrbase/dsp/devicesamplesource.h
+++ b/sdrbase/dsp/devicesamplesource.h
@@ -31,7 +31,7 @@ public:
 	DeviceSampleSource();
 	virtual ~DeviceSampleSource();
 
-	virtual bool start(int device) = 0;
+	virtual bool start() = 0;
 	virtual void stop() = 0;
 
 	virtual const QString& getDeviceDescription() const = 0;
diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp
index 1b81e827e..4e257d34b 100644
--- a/sdrbase/dsp/dspdevicesourceengine.cpp
+++ b/sdrbase/dsp/dspdevicesourceengine.cpp
@@ -449,7 +449,7 @@ DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoRunning()
 
 	// Start everything
 
-	if(!m_deviceSampleSource->start(m_sampleSourceSequence))
+	if(!m_deviceSampleSource->start())
 	{
 		return gotoError("Could not start sample source");
 	}