diff --git a/sdrbase/dsp/dspengine.cpp b/sdrbase/dsp/dspengine.cpp
index 1cee2e2df..f1b2b7e5d 100644
--- a/sdrbase/dsp/dspengine.cpp
+++ b/sdrbase/dsp/dspengine.cpp
@@ -125,18 +125,6 @@ void DSPEngine::removeSink(SampleSink* sink, uint deviceIndex)
 	m_deviceEngines[deviceIndex]->removeSink(sink);
 }
 
-void DSPEngine::addThreadedSink(ThreadedSampleSink* sink, uint deviceIndex)
-{
-	qDebug("DSPEngine::addThreadedSink(%d)", deviceIndex);
-	m_deviceEngines[deviceIndex]->addThreadedSink(sink);
-}
-
-void DSPEngine::removeThreadedSink(ThreadedSampleSink* sink, uint deviceIndex)
-{
-	qDebug("DSPEngine::removeThreadedSink(%d)", deviceIndex);
-	m_deviceEngines[deviceIndex]->removeThreadedSink(sink);
-}
-
 void DSPEngine::addAudioSink(AudioFifo* audioFifo)
 {
 	qDebug("DSPEngine::addAudioSink");
diff --git a/sdrbase/dsp/dspengine.h b/sdrbase/dsp/dspengine.h
index 1d546a284..03b887542 100644
--- a/sdrbase/dsp/dspengine.h
+++ b/sdrbase/dsp/dspengine.h
@@ -55,9 +55,6 @@ public:
 	void addSink(SampleSink* sink, uint deviceIndex = 0); //!< Add a sample sink
 	void removeSink(SampleSink* sink, uint deviceIndex = 0); //!< Remove a sample sink
 
-	void addThreadedSink(ThreadedSampleSink* sink, uint deviceIndex = 0); //!< Add a sample sink that will run on its own thread
-	void removeThreadedSink(ThreadedSampleSink* sink, uint deviceIndex = 0); //!< Remove a sample sink that runs on its own thread
-
     void configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection, uint deviceIndex = 0); //!< Configure DSP corrections
 
     DSPDeviceEngine *getDeviceEngineByIndex(uint deviceIndex) { return m_deviceEngines[deviceIndex]; }
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index 8d4e9109e..d4e1378cf 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -115,7 +115,7 @@ MainWindow::MainWindow(QWidget* parent) :
 
 	ui->tabSpectra->addTab(m_deviceUIs.back()->m_spectrum, "X0");
 	ui->tabSpectraGUI->addTab(m_deviceUIs.back()->m_spectrumGUI, "X0");
-	m_dspEngine->addSink(m_deviceUIs.back()->m_spectrumVis);
+	dspDeviceEngine->addSink(m_deviceUIs.back()->m_spectrumVis);
 	ui->tabChannels->addTab(m_deviceUIs.back()->m_channelWindow, "X0");
 	bool sampleSourceSignalsBlocked = m_deviceUIs.back()->m_sampleSource->blockSignals(true);
 	m_pluginManager->fillSampleSourceSelector(m_deviceUIs.back()->m_sampleSource);
@@ -124,7 +124,7 @@ MainWindow::MainWindow(QWidget* parent) :
 	ui->tabInputs->addTab(m_deviceUIs.back()->m_sampleSource, "X0");
 
 	m_fileSink = new FileSink();
-	m_dspEngine->addSink(m_fileSink);
+	dspDeviceEngine->addSink(m_fileSink); // TODO: one file sink per device engine
 
 	qDebug() << "MainWindow::MainWindow: loadSettings...";
 
@@ -174,7 +174,7 @@ MainWindow::~MainWindow()
 		delete m_deviceUIs[i];
 	}
 
-	m_dspEngine->removeSink(m_fileSink);
+	m_dspEngine->removeSink(m_fileSink); // TODO: one file sink per device engine
 	//m_dspEngine->removeSink(m_rxSpectrumVis);
 	delete m_fileSink;
 	//delete m_rxSpectrumVis;