diff --git a/plugins/channelrx/channelpower/channelpower.cpp b/plugins/channelrx/channelpower/channelpower.cpp
index f86272b05b..d3163ae0cd 100644
--- a/plugins/channelrx/channelpower/channelpower.cpp
+++ b/plugins/channelrx/channelpower/channelpower.cpp
@@ -49,7 +49,7 @@ ChannelPower::ChannelPower(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new ChannelPowerBaseband(this);
+    m_basebandSink = new ChannelPowerBaseband();
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
 
diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.cpp b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
index 1f9bd38adf..4858dc4a72 100644
--- a/plugins/channelrx/channelpower/channelpowerbaseband.cpp
+++ b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
@@ -25,8 +25,7 @@
 
 MESSAGE_CLASS_DEFINITION(ChannelPowerBaseband::MsgConfigureChannelPowerBaseband, Message)
 
-ChannelPowerBaseband::ChannelPowerBaseband(ChannelPower *channelPower) :
-    m_sink(channelPower),
+ChannelPowerBaseband::ChannelPowerBaseband() :
     m_running(false)
 {
     qDebug("ChannelPowerBaseband::ChannelPowerBaseband");
diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.h b/plugins/channelrx/channelpower/channelpowerbaseband.h
index b0e1bd3ccd..d5fc8fa77e 100644
--- a/plugins/channelrx/channelpower/channelpowerbaseband.h
+++ b/plugins/channelrx/channelpower/channelpowerbaseband.h
@@ -62,7 +62,7 @@ class ChannelPowerBaseband : public QObject
         { }
     };
 
-    ChannelPowerBaseband(ChannelPower *channelPower);
+    ChannelPowerBaseband();
     ~ChannelPowerBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/channelpower/channelpowersink.cpp b/plugins/channelrx/channelpower/channelpowersink.cpp
index f34c948aef..67606e21e1 100644
--- a/plugins/channelrx/channelpower/channelpowersink.cpp
+++ b/plugins/channelrx/channelpower/channelpowersink.cpp
@@ -20,14 +20,12 @@
 
 #include "channelpowersink.h"
 
-ChannelPowerSink::ChannelPowerSink(ChannelPower *channelPower) :
+ChannelPowerSink::ChannelPowerSink() :
         m_channelSampleRate(10000),
         m_channelFrequencyOffset(0),
         m_lowpassFFT(nullptr),
         m_lowpassBufferIdx(0)
 {
-    (void)channelPower;
-
     resetMagLevels();
 
     applySettings(m_settings, QStringList(), true);
diff --git a/plugins/channelrx/channelpower/channelpowersink.h b/plugins/channelrx/channelpower/channelpowersink.h
index 3f276f293c..5111aa0841 100644
--- a/plugins/channelrx/channelpower/channelpowersink.h
+++ b/plugins/channelrx/channelpower/channelpowersink.h
@@ -32,7 +32,7 @@ class ChannelPower;
 
 class ChannelPowerSink : public ChannelSampleSink {
 public:
-    ChannelPowerSink(ChannelPower *channelPower);
+    ChannelPowerSink();
     ~ChannelPowerSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h
index ebf2574080..d083798575 100644
--- a/plugins/channelrx/demodadsb/adsbdemodgui.h
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.h
@@ -812,9 +812,7 @@ class ModelMatch {
         m_aircraftRegExp.optimize();
     }
     
-    virtual ~ModelMatch()
-    {
-    }
+    virtual ~ModelMatch() = default;
 
     virtual bool match(const QString &aircraft, const QString &manufacturer, QString &model)
     {
diff --git a/plugins/channelrx/demodapt/aptdemod.cpp b/plugins/channelrx/demodapt/aptdemod.cpp
index 625375403d..505634dc5c 100644
--- a/plugins/channelrx/demodapt/aptdemod.cpp
+++ b/plugins/channelrx/demodapt/aptdemod.cpp
@@ -55,7 +55,7 @@ APTDemod::APTDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new APTDemodBaseband(this);
+    m_basebandSink = new APTDemodBaseband();
     m_basebandSink->moveToThread(&m_thread);
 
     m_imageWorker = new APTDemodImageWorker(this);
diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.cpp b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
index e58384af05..b19a857402 100644
--- a/plugins/channelrx/demodapt/aptdemodbaseband.cpp
+++ b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(APTDemodBaseband::MsgConfigureAPTDemodBaseband, Message)
 
-APTDemodBaseband::APTDemodBaseband(APTDemod *packetDemod) :
-    m_sink(packetDemod),
+APTDemodBaseband::APTDemodBaseband() :
     m_running(false)
 {
     qDebug("APTDemodBaseband::APTDemodBaseband");
diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.h b/plugins/channelrx/demodapt/aptdemodbaseband.h
index e9f75156ec..72cdce30fd 100644
--- a/plugins/channelrx/demodapt/aptdemodbaseband.h
+++ b/plugins/channelrx/demodapt/aptdemodbaseband.h
@@ -58,7 +58,7 @@ class APTDemodBaseband : public QObject
         { }
     };
 
-    APTDemodBaseband(APTDemod *packetDemod);
+    APTDemodBaseband();
     ~APTDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodapt/aptdemodsink.cpp b/plugins/channelrx/demodapt/aptdemodsink.cpp
index 87a156c5c0..dffbcd243e 100644
--- a/plugins/channelrx/demodapt/aptdemodsink.cpp
+++ b/plugins/channelrx/demodapt/aptdemodsink.cpp
@@ -23,7 +23,7 @@
 #include "aptdemod.h"
 #include "aptdemodsink.h"
 
-APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
+APTDemodSink::APTDemodSink() :
         m_channelSampleRate(APTDEMOD_AUDIO_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -32,7 +32,6 @@ APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
         m_imageWorkerMessageQueue(nullptr),
         m_samples(nullptr)
 {
-    (void)packetDemod;
 
     m_magsq = 0.0;
 
diff --git a/plugins/channelrx/demodapt/aptdemodsink.h b/plugins/channelrx/demodapt/aptdemodsink.h
index 7a4f85d530..5afd7403e3 100644
--- a/plugins/channelrx/demodapt/aptdemodsink.h
+++ b/plugins/channelrx/demodapt/aptdemodsink.h
@@ -44,7 +44,7 @@ class APTDemod;
 
 class APTDemodSink : public ChannelSampleSink {
 public:
-    APTDemodSink(APTDemod *packetDemod);
+    APTDemodSink();
     ~APTDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp
index 6b51cf6642..0599f3b6c7 100644
--- a/plugins/channelrx/demoddab/dabdemod.cpp
+++ b/plugins/channelrx/demoddab/dabdemod.cpp
@@ -64,7 +64,7 @@ DABDemod::DABDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new DABDemodBaseband(this);
+    m_basebandSink = new DABDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.cpp b/plugins/channelrx/demoddab/dabdemodbaseband.cpp
index 985030dbcc..db6bee617d 100644
--- a/plugins/channelrx/demoddab/dabdemodbaseband.cpp
+++ b/plugins/channelrx/demoddab/dabdemodbaseband.cpp
@@ -28,8 +28,7 @@
 
 MESSAGE_CLASS_DEFINITION(DABDemodBaseband::MsgConfigureDABDemodBaseband, Message)
 
-DABDemodBaseband::DABDemodBaseband(DABDemod *packetDemod) :
-    m_sink(packetDemod),
+DABDemodBaseband::DABDemodBaseband() :
     m_running(false)
 {
     qDebug("DABDemodBaseband::DABDemodBaseband");
diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.h b/plugins/channelrx/demoddab/dabdemodbaseband.h
index dfb6d85a33..90b7eeef84 100644
--- a/plugins/channelrx/demoddab/dabdemodbaseband.h
+++ b/plugins/channelrx/demoddab/dabdemodbaseband.h
@@ -60,7 +60,7 @@ class DABDemodBaseband : public QObject
         { }
     };
 
-    DABDemodBaseband(DABDemod *packetDemod);
+    DABDemodBaseband();
     ~DABDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demoddab/dabdemodsink.cpp b/plugins/channelrx/demoddab/dabdemodsink.cpp
index 70a1f0b25b..b599c24b59 100644
--- a/plugins/channelrx/demoddab/dabdemodsink.cpp
+++ b/plugins/channelrx/demoddab/dabdemodsink.cpp
@@ -487,7 +487,7 @@ void DABDemodSink::processOneAudioSample(Complex &ci)
     }
 }
 
-DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
+DABDemodSink::DABDemodSink() :
         m_audioSampleRate(48000),
         m_dabAudioSampleRate(10000), // Unused value to begin with
         m_channelSampleRate(DABDEMOD_CHANNEL_SAMPLE_RATE),
@@ -499,8 +499,6 @@ DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
         m_messageQueueToChannel(nullptr),
         m_audioFifo(48000)
 {
-    (void)packetDemod;
-
     m_audioBuffer.resize(1<<14);
     m_audioBufferFill = 0;
 
diff --git a/plugins/channelrx/demoddab/dabdemodsink.h b/plugins/channelrx/demoddab/dabdemodsink.h
index 1dd9750755..a808ccf7b7 100644
--- a/plugins/channelrx/demoddab/dabdemodsink.h
+++ b/plugins/channelrx/demoddab/dabdemodsink.h
@@ -43,7 +43,7 @@ class DABDemod;
 
 class DABDemodSink : public ChannelSampleSink {
 public:
-    DABDemodSink(DABDemod *packetDemod);
+    DABDemodSink();
     ~DABDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/demodils/ilsdemod.cpp b/plugins/channelrx/demodils/ilsdemod.cpp
index 1ca59c2a62..23a17a4a10 100644
--- a/plugins/channelrx/demodils/ilsdemod.cpp
+++ b/plugins/channelrx/demodils/ilsdemod.cpp
@@ -61,7 +61,7 @@ ILSDemod::ILSDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new ILSDemodBaseband(this);
+    m_basebandSink = new ILSDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.cpp b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
index 201a60883d..9f43bee22b 100644
--- a/plugins/channelrx/demodils/ilsdemodbaseband.cpp
+++ b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
@@ -27,8 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(ILSDemodBaseband::MsgConfigureILSDemodBaseband, Message)
 
-ILSDemodBaseband::ILSDemodBaseband(ILSDemod *packetDemod) :
-    m_sink(packetDemod),
+ILSDemodBaseband::ILSDemodBaseband() :
     m_running(false)
 {
     qDebug("ILSDemodBaseband::ILSDemodBaseband");
diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.h b/plugins/channelrx/demodils/ilsdemodbaseband.h
index 18830f9a19..545b6b53c3 100644
--- a/plugins/channelrx/demodils/ilsdemodbaseband.h
+++ b/plugins/channelrx/demodils/ilsdemodbaseband.h
@@ -63,7 +63,7 @@ class ILSDemodBaseband : public QObject
         { }
     };
 
-    ILSDemodBaseband(ILSDemod *packetDemod);
+    ILSDemodBaseband();
     ~ILSDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodils/ilsdemodsink.cpp b/plugins/channelrx/demodils/ilsdemodsink.cpp
index 8bd2f2d1cb..939e16fa8c 100644
--- a/plugins/channelrx/demodils/ilsdemodsink.cpp
+++ b/plugins/channelrx/demodils/ilsdemodsink.cpp
@@ -28,7 +28,7 @@
 #include "ilsdemod.h"
 #include "ilsdemodsink.h"
 
-ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :
+ILSDemodSink::ILSDemodSink() :
         m_spectrumSink(nullptr),
         m_scopeSink(nullptr),
         m_channel(nullptr),
@@ -50,8 +50,6 @@ ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :
         m_audioFifo(48000),
         m_sampleBufferIndex(0)
 {
-	(void)ilsDemod;
-
 	m_audioBuffer.resize(1<<14);
 	m_audioBufferFill = 0;
 
diff --git a/plugins/channelrx/demodils/ilsdemodsink.h b/plugins/channelrx/demodils/ilsdemodsink.h
index ebcef81f75..9eaeb5bc02 100644
--- a/plugins/channelrx/demodils/ilsdemodsink.h
+++ b/plugins/channelrx/demodils/ilsdemodsink.h
@@ -44,7 +44,7 @@ class SpectrumVis;
 
 class ILSDemodSink : public ChannelSampleSink {
 public:
-    ILSDemodSink(ILSDemod *packetDemod);
+    ILSDemodSink();
     ~ILSDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/demodnavtex/navtexdemod.cpp b/plugins/channelrx/demodnavtex/navtexdemod.cpp
index eddb49d4e1..49655fefbd 100644
--- a/plugins/channelrx/demodnavtex/navtexdemod.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemod.cpp
@@ -53,7 +53,7 @@ NavtexDemod::NavtexDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new NavtexDemodBaseband(this);
+    m_basebandSink = new NavtexDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
index 8720ceddf7..1187365fe3 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(NavtexDemodBaseband::MsgConfigureNavtexDemodBaseband, Message)
 
-NavtexDemodBaseband::NavtexDemodBaseband(NavtexDemod *navtexDemod) :
-    m_sink(navtexDemod),
+NavtexDemodBaseband::NavtexDemodBaseband() :
     m_running(false)
 {
     qDebug("NavtexDemodBaseband::NavtexDemodBaseband");
diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.h b/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
index 80d7667b5a..c78ed23d82 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
+++ b/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
@@ -62,7 +62,7 @@ class NavtexDemodBaseband : public QObject
         { }
     };
 
-    NavtexDemodBaseband(NavtexDemod *navtexDemod);
+    NavtexDemodBaseband();
     ~NavtexDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
index fb82db6696..c894dc30bc 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
@@ -27,7 +27,7 @@
 #include "navtexdemod.h"
 #include "navtexdemodsink.h"
 
-NavtexDemodSink::NavtexDemodSink(NavtexDemod *packetDemod) :
+NavtexDemodSink::NavtexDemodSink() :
         m_channelSampleRate(NavtexDemodSettings::NAVTEXDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -37,7 +37,6 @@ NavtexDemodSink::NavtexDemodSink(NavtexDemod *packetDemod) :
         m_exp(nullptr),
         m_sampleBufferIndex(0)
 {
-    (void)packetDemod;
     m_magsq = 0.0;
 
     m_sampleBuffer.resize(m_sampleBufferSize);
diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.h b/plugins/channelrx/demodnavtex/navtexdemodsink.h
index 8f3305dbfd..0a9ffdd2cb 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodsink.h
+++ b/plugins/channelrx/demodnavtex/navtexdemodsink.h
@@ -39,7 +39,7 @@ class ScopeVis;
 
 class NavtexDemodSink : public ChannelSampleSink {
 public:
-    NavtexDemodSink(NavtexDemod *packetDemod);
+    NavtexDemodSink();
     ~NavtexDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/demodpager/pagerdemod.cpp b/plugins/channelrx/demodpager/pagerdemod.cpp
index 49bb2af58b..811891d2c6 100644
--- a/plugins/channelrx/demodpager/pagerdemod.cpp
+++ b/plugins/channelrx/demodpager/pagerdemod.cpp
@@ -46,7 +46,7 @@ PagerDemod::PagerDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new PagerDemodBaseband(this);
+    m_basebandSink = new PagerDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
index 1e38cce06f..07dfbaa00d 100644
--- a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(PagerDemodBaseband::MsgConfigurePagerDemodBaseband, Message)
 
-PagerDemodBaseband::PagerDemodBaseband(PagerDemod *pagerDemod) :
-    m_sink(pagerDemod),
+PagerDemodBaseband::PagerDemodBaseband() :
     m_running(false)
 {
     qDebug("PagerDemodBaseband::PagerDemodBaseband");
diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.h b/plugins/channelrx/demodpager/pagerdemodbaseband.h
index 33e81ff34b..3c8a667352 100644
--- a/plugins/channelrx/demodpager/pagerdemodbaseband.h
+++ b/plugins/channelrx/demodpager/pagerdemodbaseband.h
@@ -62,7 +62,7 @@ class PagerDemodBaseband : public QObject
         { }
     };
 
-    PagerDemodBaseband(PagerDemod *pagerDemod);
+    PagerDemodBaseband();
     ~PagerDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodpager/pagerdemodsink.cpp b/plugins/channelrx/demodpager/pagerdemodsink.cpp
index 7bbd925875..1f72d8d89a 100644
--- a/plugins/channelrx/demodpager/pagerdemodsink.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodsink.cpp
@@ -28,7 +28,7 @@
 #include "pagerdemod.h"
 #include "pagerdemodsink.h"
 
-PagerDemodSink::PagerDemodSink(PagerDemod *pagerDemod) :
+PagerDemodSink::PagerDemodSink() :
         m_scopeSink(nullptr),
         m_channelSampleRate(PagerDemodSettings::m_channelSampleRate),
         m_channelFrequencyOffset(0),
@@ -49,8 +49,6 @@ PagerDemodSink::PagerDemodSink(PagerDemod *pagerDemod) :
         m_addressValid(0),
         m_sampleBufferIndex(0)
 {
-    (void)pagerDemod;
-
     m_magsq = 0.0;
 
     m_demodBuffer.resize(1<<12);
diff --git a/plugins/channelrx/demodpager/pagerdemodsink.h b/plugins/channelrx/demodpager/pagerdemodsink.h
index daee29625a..840f547eef 100644
--- a/plugins/channelrx/demodpager/pagerdemodsink.h
+++ b/plugins/channelrx/demodpager/pagerdemodsink.h
@@ -45,7 +45,7 @@ class ScopeVis;
 
 class PagerDemodSink : public ChannelSampleSink {
 public:
-    PagerDemodSink(PagerDemod *pagerDemod);
+    PagerDemodSink();
     ~PagerDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/demodrtty/rttydemod.cpp b/plugins/channelrx/demodrtty/rttydemod.cpp
index 68c71ca09e..d35daf14d9 100644
--- a/plugins/channelrx/demodrtty/rttydemod.cpp
+++ b/plugins/channelrx/demodrtty/rttydemod.cpp
@@ -53,7 +53,7 @@ RttyDemod::RttyDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new RttyDemodBaseband(this);
+    m_basebandSink = new RttyDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
index f134a1ab82..e07245a511 100644
--- a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(RttyDemodBaseband::MsgConfigureRttyDemodBaseband, Message)
 
-RttyDemodBaseband::RttyDemodBaseband(RttyDemod *rttyDemod) :
-    m_sink(rttyDemod),
+RttyDemodBaseband::RttyDemodBaseband() :
     m_running(false)
 {
     qDebug("RttyDemodBaseband::RttyDemodBaseband");
diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.h b/plugins/channelrx/demodrtty/rttydemodbaseband.h
index 3f23df8e5e..35344b7106 100644
--- a/plugins/channelrx/demodrtty/rttydemodbaseband.h
+++ b/plugins/channelrx/demodrtty/rttydemodbaseband.h
@@ -62,7 +62,7 @@ class RttyDemodBaseband : public QObject
         { }
     };
 
-    RttyDemodBaseband(RttyDemod *rttyDemod);
+    RttyDemodBaseband();
     ~RttyDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp
index b39217296c..324d8c0e0f 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@@ -28,7 +28,7 @@
 #include "rttydemod.h"
 #include "rttydemodsink.h"
 
-RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
+RttyDemodSink::RttyDemodSink() :
         m_channelSampleRate(RttyDemodSettings::RTTYDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -47,8 +47,6 @@ RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
         m_fftCounter(0),
         m_sampleBufferIndex(0)
 {
-    (void)packetDemod;
-
     m_magsq = 0.0;
 
     m_sampleBuffer.resize(m_sampleBufferSize);
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.h b/plugins/channelrx/demodrtty/rttydemodsink.h
index ed50892257..96b91bbad5 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.h
+++ b/plugins/channelrx/demodrtty/rttydemodsink.h
@@ -39,7 +39,7 @@ class ScopeVis;
 
 class RttyDemodSink : public ChannelSampleSink {
 public:
-    RttyDemodSink(RttyDemod *packetDemod);
+    RttyDemodSink();
     ~RttyDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/freqscanner/freqscanner.cpp b/plugins/channelrx/freqscanner/freqscanner.cpp
index e5d62b59f8..48708d72a0 100644
--- a/plugins/channelrx/freqscanner/freqscanner.cpp
+++ b/plugins/channelrx/freqscanner/freqscanner.cpp
@@ -153,7 +153,7 @@ void FreqScanner::start()
 
     qDebug("FreqScanner::start");
     m_thread = new QThread();
-    m_basebandSink = new FreqScannerBaseband(this);
+    m_basebandSink = new FreqScannerBaseband();
     m_basebandSink->setFifoLabel(QString("%1 [%2:%3]")
         .arg(m_channelId)
         .arg(m_deviceAPI->getDeviceSetIndex())
diff --git a/plugins/channelrx/freqscanner/freqscannerbaseband.cpp b/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
index 2ddaaa3083..4fd211e2be 100644
--- a/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
+++ b/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
@@ -27,9 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(FreqScannerBaseband::MsgConfigureFreqScannerBaseband, Message)
 
-FreqScannerBaseband::FreqScannerBaseband(FreqScanner *freqScanner) :
-    m_freqScanner(freqScanner),
-    m_sink(freqScanner),
+FreqScannerBaseband::FreqScannerBaseband() :
     m_messageQueueToGUI(nullptr)
 {
     qDebug("FreqScannerBaseband::FreqScannerBaseband");
diff --git a/plugins/channelrx/freqscanner/freqscannerbaseband.h b/plugins/channelrx/freqscanner/freqscannerbaseband.h
index 2fcdc2d7ae..5a832ff418 100644
--- a/plugins/channelrx/freqscanner/freqscannerbaseband.h
+++ b/plugins/channelrx/freqscanner/freqscannerbaseband.h
@@ -63,7 +63,7 @@ class FreqScannerBaseband : public QObject
         { }
     };
 
-    FreqScannerBaseband(FreqScanner *freqScanner);
+    FreqScannerBaseband();
     ~FreqScannerBaseband();
     void reset();
     void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/freqscanner/freqscannersink.cpp b/plugins/channelrx/freqscanner/freqscannersink.cpp
index cd90b35e76..a7069162d9 100644
--- a/plugins/channelrx/freqscanner/freqscannersink.cpp
+++ b/plugins/channelrx/freqscanner/freqscannersink.cpp
@@ -26,7 +26,7 @@
 #include "freqscanner.h"
 #include "freqscannersink.h"
 
-FreqScannerSink::FreqScannerSink(FreqScanner *ilsDemod) :
+FreqScannerSink::FreqScannerSink() :
         m_channel(nullptr),
         m_channelSampleRate(48000),
         m_channelFrequencyOffset(0),
@@ -40,7 +40,6 @@ FreqScannerSink::FreqScannerSink(FreqScanner *ilsDemod) :
         m_binsPerChannel(16),
         m_averageCount(0)
 {
-    (void)ilsDemod;
    
     applySettings(m_settings, QStringList(), true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, 16, 4, true);
diff --git a/plugins/channelrx/freqscanner/freqscannersink.h b/plugins/channelrx/freqscanner/freqscannersink.h
index dcf3111453..4fe85aeb44 100644
--- a/plugins/channelrx/freqscanner/freqscannersink.h
+++ b/plugins/channelrx/freqscanner/freqscannersink.h
@@ -37,7 +37,7 @@ class FreqScanner;
 
 class FreqScannerSink : public ChannelSampleSink {
 public:
-    FreqScannerSink(FreqScanner *packetDemod);
+    FreqScannerSink();
     ~FreqScannerSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/heatmap/heatmap.cpp b/plugins/channelrx/heatmap/heatmap.cpp
index 6695ca8646..7b36f0d469 100644
--- a/plugins/channelrx/heatmap/heatmap.cpp
+++ b/plugins/channelrx/heatmap/heatmap.cpp
@@ -46,7 +46,7 @@ HeatMap::HeatMap(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new HeatMapBaseband(this);
+    m_basebandSink = new HeatMapBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/heatmap/heatmapbaseband.cpp b/plugins/channelrx/heatmap/heatmapbaseband.cpp
index 551f3481a0..db6add6614 100644
--- a/plugins/channelrx/heatmap/heatmapbaseband.cpp
+++ b/plugins/channelrx/heatmap/heatmapbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(HeatMapBaseband::MsgConfigureHeatMapBaseband, Message)
 
-HeatMapBaseband::HeatMapBaseband(HeatMap *heatDemod) :
-    m_sink(heatDemod),
+HeatMapBaseband::HeatMapBaseband() :
     m_running(false)
 {
     qDebug("HeatMapBaseband::HeatMapBaseband");
diff --git a/plugins/channelrx/heatmap/heatmapbaseband.h b/plugins/channelrx/heatmap/heatmapbaseband.h
index 7ba4ff8e19..ef2bcb1e77 100644
--- a/plugins/channelrx/heatmap/heatmapbaseband.h
+++ b/plugins/channelrx/heatmap/heatmapbaseband.h
@@ -62,7 +62,7 @@ class HeatMapBaseband : public QObject
         { }
     };
 
-    HeatMapBaseband(HeatMap *heatDemod);
+    HeatMapBaseband();
     ~HeatMapBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/heatmap/heatmapsink.cpp b/plugins/channelrx/heatmap/heatmapsink.cpp
index bccf2408c4..202e9fb7fb 100644
--- a/plugins/channelrx/heatmap/heatmapsink.cpp
+++ b/plugins/channelrx/heatmap/heatmapsink.cpp
@@ -24,7 +24,7 @@
 #include "heatmap.h"
 #include "heatmapsink.h"
 
-HeatMapSink::HeatMapSink(HeatMap *heatMap) :
+HeatMapSink::HeatMapSink() :
         m_scopeSink(nullptr),
         m_channelSampleRate(10000),
         m_channelFrequencyOffset(0),
@@ -36,8 +36,6 @@ HeatMapSink::HeatMapSink(HeatMap *heatMap) :
         m_sampleBufferSize(1000),
         m_sampleBufferIndex(0)
 {
-    (void)heatMap;
-
     resetMagLevels();
     m_sampleBuffer.resize(m_sampleBufferSize);
 
diff --git a/plugins/channelrx/heatmap/heatmapsink.h b/plugins/channelrx/heatmap/heatmapsink.h
index e20e57a21a..66f364315e 100644
--- a/plugins/channelrx/heatmap/heatmapsink.h
+++ b/plugins/channelrx/heatmap/heatmapsink.h
@@ -41,7 +41,7 @@ class ScopeVis;
 
 class HeatMapSink : public ChannelSampleSink {
 public:
-    HeatMapSink(HeatMap *heatMap);
+    HeatMapSink();
     ~HeatMapSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/localsink/localsinksettings.cpp b/plugins/channelrx/localsink/localsinksettings.cpp
index 1e019ffe4e..823edcfd23 100644
--- a/plugins/channelrx/localsink/localsinksettings.cpp
+++ b/plugins/channelrx/localsink/localsinksettings.cpp
@@ -53,7 +53,7 @@ void LocalSinkSettings::resetToDefaults()
     m_reverseAPIChannelIndex = 0;
     m_workspaceIndex = 0;
     m_hidden = false;
-    m_maxFFTBands = 32;
+    m_maxFFTBands = 20;
 }
 
 QByteArray LocalSinkSettings::serialize() const
diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp
index 2c4ff78bec..ee06c485d9 100644
--- a/plugins/channelrx/noisefigure/noisefigure.cpp
+++ b/plugins/channelrx/noisefigure/noisefigure.cpp
@@ -62,7 +62,7 @@ NoiseFigure::NoiseFigure(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new NoiseFigureBaseband(this);
+    m_basebandSink = new NoiseFigureBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
index 163432a4fb..b0268d77a7 100644
--- a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
+++ b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(NoiseFigureBaseband::MsgConfigureNoiseFigureBaseband, Message)
 
-NoiseFigureBaseband::NoiseFigureBaseband(NoiseFigure *aisDemod) :
-    m_sink(aisDemod),
+NoiseFigureBaseband::NoiseFigureBaseband() :
     m_running(false)
 {
     qDebug("NoiseFigureBaseband::NoiseFigureBaseband");
diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.h b/plugins/channelrx/noisefigure/noisefigurebaseband.h
index 0944ce5fe5..816485b19b 100644
--- a/plugins/channelrx/noisefigure/noisefigurebaseband.h
+++ b/plugins/channelrx/noisefigure/noisefigurebaseband.h
@@ -60,7 +60,7 @@ class NoiseFigureBaseband : public QObject
         { }
     };
 
-    NoiseFigureBaseband(NoiseFigure *aisDemod);
+    NoiseFigureBaseband();
     ~NoiseFigureBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/noisefigure/noisefiguresink.cpp b/plugins/channelrx/noisefigure/noisefiguresink.cpp
index 62a381032f..76c0e4c2a8 100644
--- a/plugins/channelrx/noisefigure/noisefiguresink.cpp
+++ b/plugins/channelrx/noisefigure/noisefiguresink.cpp
@@ -25,7 +25,7 @@
 #include "noisefigure.h"
 #include "noisefiguresink.h"
 
-NoiseFigureSink::NoiseFigureSink(NoiseFigure *noiseFigure) :
+NoiseFigureSink::NoiseFigureSink() :
         m_channelSampleRate(48000),
         m_fftSequence(-1),
         m_fft(nullptr),
@@ -38,8 +38,6 @@ NoiseFigureSink::NoiseFigureSink(NoiseFigure *noiseFigure) :
         m_count(0),
         m_enabled(false)
 {
-    (void)noiseFigure;
-
     m_magsq = 0.0;
 
     applySettings(m_settings, true);
diff --git a/plugins/channelrx/noisefigure/noisefiguresink.h b/plugins/channelrx/noisefigure/noisefiguresink.h
index 007a1fbe73..666215d363 100644
--- a/plugins/channelrx/noisefigure/noisefiguresink.h
+++ b/plugins/channelrx/noisefigure/noisefiguresink.h
@@ -38,7 +38,7 @@ class NoiseFigure;
 
 class NoiseFigureSink : public ChannelSampleSink {
 public:
-    NoiseFigureSink(NoiseFigure *aisDemod);
+    NoiseFigureSink();
     ~NoiseFigureSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/radioclock/radioclock.cpp b/plugins/channelrx/radioclock/radioclock.cpp
index 9f0420feb4..6505bb031a 100644
--- a/plugins/channelrx/radioclock/radioclock.cpp
+++ b/plugins/channelrx/radioclock/radioclock.cpp
@@ -51,7 +51,7 @@ RadioClock::RadioClock(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new RadioClockBaseband(this);
+    m_basebandSink = new RadioClockBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/radioclock/radioclockbaseband.cpp b/plugins/channelrx/radioclock/radioclockbaseband.cpp
index 0a48c688c7..03d3ceb2ed 100644
--- a/plugins/channelrx/radioclock/radioclockbaseband.cpp
+++ b/plugins/channelrx/radioclock/radioclockbaseband.cpp
@@ -27,8 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(RadioClockBaseband::MsgConfigureRadioClockBaseband, Message)
 
-RadioClockBaseband::RadioClockBaseband(RadioClock *radioClock) :
-    m_sink(radioClock),
+RadioClockBaseband::RadioClockBaseband() :
     m_running(false)
 {
     qDebug("RadioClockBaseband::RadioClockBaseband");
diff --git a/plugins/channelrx/radioclock/radioclockbaseband.h b/plugins/channelrx/radioclock/radioclockbaseband.h
index 80d813089c..410362880c 100644
--- a/plugins/channelrx/radioclock/radioclockbaseband.h
+++ b/plugins/channelrx/radioclock/radioclockbaseband.h
@@ -62,7 +62,7 @@ class RadioClockBaseband : public QObject
         { }
     };
 
-    RadioClockBaseband(RadioClock *radioClock);
+    RadioClockBaseband();
     ~RadioClockBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/radioclock/radioclocksink.cpp b/plugins/channelrx/radioclock/radioclocksink.cpp
index 9598249aab..b23b3e05cf 100644
--- a/plugins/channelrx/radioclock/radioclocksink.cpp
+++ b/plugins/channelrx/radioclock/radioclocksink.cpp
@@ -26,7 +26,7 @@
 #include "radioclock.h"
 #include "radioclocksink.h"
 
-RadioClockSink::RadioClockSink(RadioClock *radioClock) :
+RadioClockSink::RadioClockSink() :
         m_scopeSink(nullptr),
         m_channelSampleRate(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
@@ -47,9 +47,7 @@ RadioClockSink::RadioClockSink(RadioClock *radioClock) :
         m_zeroCount(0),
         m_sampleBufferIndex(0),
         m_gotMarker(false)
-{
-    (void)radioClock;
-   
+{   
     m_phaseDiscri.setFMScaling(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE / (2.0f * 20.0/M_PI));
     applySettings(m_settings, true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
diff --git a/plugins/channelrx/radioclock/radioclocksink.h b/plugins/channelrx/radioclock/radioclocksink.h
index 58fe8809a5..316cb9ecd7 100644
--- a/plugins/channelrx/radioclock/radioclocksink.h
+++ b/plugins/channelrx/radioclock/radioclocksink.h
@@ -42,7 +42,7 @@ class ScopeVis;
 
 class RadioClockSink : public ChannelSampleSink {
 public:
-    RadioClockSink(RadioClock *radioClock);
+    RadioClockSink();
     ~RadioClockSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/wdsprx/wdsprx.cpp b/plugins/channelrx/wdsprx/wdsprx.cpp
index 12f5f46702..c092e6b420 100644
--- a/plugins/channelrx/wdsprx/wdsprx.cpp
+++ b/plugins/channelrx/wdsprx/wdsprx.cpp
@@ -892,7 +892,7 @@ void WDSPRx::sendChannelSettings(
     const WDSPRxSettings& settings,
     bool force)
 {
-    qDebug("WDSPRx::sendChannelSettings: %d pipes", pipes.size());
+    qDebug("WDSPRx::sendChannelSettings: %d pipes", (int)pipes.size());
 
     for (const auto& pipe : pipes)
     {
diff --git a/sdrgui/gui/glshaderspectrogram.cpp b/sdrgui/gui/glshaderspectrogram.cpp
index d17a36138f..a79428fe26 100644
--- a/sdrgui/gui/glshaderspectrogram.cpp
+++ b/sdrgui/gui/glshaderspectrogram.cpp
@@ -21,9 +21,7 @@
 #if defined(ANDROID)
 #include <QOpenGLFunctions_ES2>
 #else
-#include <QOpenGLFunctions_2_0>
-#include <QOpenGLFunctions_2_1>
-#include <QOpenGLFunctions_3_0>
+#include <QOpenGLFunctions_3_3_Core>
 #endif
 #include <QOpenGLContext>
 #include <QtOpenGL>