diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
index a0e23d9e2..0762af326 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
@@ -90,7 +90,6 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceUISet *deviceUISet, QWidget* parent
 
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	m_statusTimer.start(500);
-	connect(&(m_deviceUISet->m_deviceSourceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
     connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
 
     m_sampleSource = (SDRdaemonSourceInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
@@ -632,11 +631,3 @@ void SDRdaemonSourceGui::updateStatus()
         ui->startStop->setEnabled(false);
     }
 }
-
-void SDRdaemonSourceGui::tick() // FIXME: needed?
-{
-	if ((++m_tickCount & 0xf) == 0) {
-		SDRdaemonSourceInput::MsgConfigureSDRdaemonStreamTiming* message = SDRdaemonSourceInput::MsgConfigureSDRdaemonStreamTiming::create();
-		m_sampleSource->getInputMessageQueue()->push(message);
-	}
-}
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
index 3c04ff99f..b85dd08df 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
@@ -130,7 +130,6 @@ private slots:
     void on_nbFECBlocks_valueChanged(int value);
     void updateHardware();
 	void updateStatus();
-	void tick();
 };
 
 #endif // INCLUDE_SDRDAEMONSOURCEGUI_H
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
index 84232843c..df62efdf6 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
@@ -232,30 +232,6 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message)
         applySettings(conf.getSettings(), conf.getForce());
         return true;
     }
-	else if (MsgConfigureSDRdaemonStreamTiming::match(message)) // FIXME: really needed? UDP handler is connected to timer
-	{
-		return true;
-	}
-	else if (MsgReportSDRdaemonSourceStreamData::match(message)) // FIXME: really needed? UDP handler sends it to GUI already
-	{
-	    // Forward message to the GUI if it is present
-	    if (getMessageQueueToGUI()) {
-	        getMessageQueueToGUI()->push(const_cast<Message*>(&message));
-	        return false; // deletion of message is handled by the GUI
-	    } else {
-	        return true; // delete the unused message
-	    }
-	}
-	else if (MsgReportSDRdaemonSourceStreamTiming::match(message)) // FIXME: really needed? UDP handler sends it to GUI already
-	{
-        // Forward message to the GUI if it is present
-        if (getMessageQueueToGUI()) {
-            getMessageQueueToGUI()->push(const_cast<Message*>(&message));
-            return false; // deletion of message is handled by the GUI
-        } else {
-            return true; // delete the unused message
-        }
-	}
 	else
 	{
 		return false;
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
index 7023c4acf..f470d454a 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
@@ -26,7 +26,7 @@
 
 const PluginDescriptor SDRdaemonSourcePlugin::m_pluginDescriptor = {
 	QString("SDRdaemon source input"),
-	QString("3.14.6"),
+	QString("4.0.0"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,