diff --git a/plugins/samplesink/fileoutput/fileoutputworker.cpp b/plugins/samplesink/fileoutput/fileoutputworker.cpp
index d31e6589a..99644b0db 100644
--- a/plugins/samplesink/fileoutput/fileoutputworker.cpp
+++ b/plugins/samplesink/fileoutput/fileoutputworker.cpp
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <assert.h>
 #include <algorithm>
 #include <QDebug>
 
@@ -39,7 +38,6 @@ FileOutputWorker::FileOutputWorker(std::ofstream *samplesStream, SampleSourceFif
     m_throttleToggle(false),
     m_buf(nullptr)
 {
-    assert(m_ofstream != nullptr);
 }
 
 FileOutputWorker::~FileOutputWorker()
diff --git a/plugins/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp
index 3b9cd6490..6e9f91234 100644
--- a/plugins/samplesink/localoutput/localoutputgui.cpp
+++ b/plugins/samplesink/localoutput/localoutputgui.cpp
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <sstream>
 #include <iostream>
-#include <cassert>
 
 #include <QDebug>
 #include <QMessageBox>
diff --git a/plugins/samplesink/remoteoutput/remoteoutputworker.cpp b/plugins/samplesink/remoteoutput/remoteoutputworker.cpp
index a1a88c31b..e295bf7d4 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputworker.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputworker.cpp
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <assert.h>
 #include <algorithm>
 #include <QDebug>
 
diff --git a/plugins/samplesink/testsink/testsinkworker.cpp b/plugins/samplesink/testsink/testsinkworker.cpp
index 4d59aa0a2..6eb9c11ab 100644
--- a/plugins/samplesink/testsink/testsinkworker.cpp
+++ b/plugins/samplesink/testsink/testsinkworker.cpp
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <assert.h>
 #include <algorithm>
 #include <QDebug>
 
@@ -225,4 +224,4 @@ void TestSinkWorker::feedSpectrum(int16_t *buf, unsigned int bufSize)
     );
 
     m_spectrumSink->feed(m_samplesVector.m_vector.begin(), m_samplesVector.m_vector.begin() + (bufSize/2), false);
-}
\ No newline at end of file
+}
diff --git a/plugins/samplesource/fileinput/fileinputworker.cpp b/plugins/samplesource/fileinput/fileinputworker.cpp
index 4c2e67523..f1b61f75d 100644
--- a/plugins/samplesource/fileinput/fileinputworker.cpp
+++ b/plugins/samplesource/fileinput/fileinputworker.cpp
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <assert.h>
 #include <QDebug>
 
 #include "dsp/filerecord.h"
@@ -49,7 +48,6 @@ FileInputWorker::FileInputWorker(std::ifstream *samplesStream,
     m_throttlems(FILESOURCE_THROTTLE_MS),
     m_throttleToggle(false)
 {
-    assert(m_ifstream != nullptr);
 }
 
 FileInputWorker::~FileInputWorker()
diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp
index a1f4d1e17..59ebb35b1 100644
--- a/plugins/samplesource/localinput/localinputgui.cpp
+++ b/plugins/samplesource/localinput/localinputgui.cpp
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <sstream>
 #include <iostream>
-#include <cassert>
 
 #include <QDebug>
 #include <QMessageBox>
diff --git a/plugins/samplesource/remoteinput/remoteinputbuffer.cpp b/plugins/samplesource/remoteinput/remoteinputbuffer.cpp
index 948733fec..6f070e09e 100644
--- a/plugins/samplesource/remoteinput/remoteinputbuffer.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputbuffer.cpp
@@ -16,7 +16,6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QDebug>
-#include <cassert>
 #include <cstring>
 #include <cmath>
 #include <algorithm>
diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp
index df1b10cae..dc73951fc 100644
--- a/plugins/samplesource/remoteinput/remoteinputgui.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <sstream>
 #include <iostream>
-#include <cassert>
 
 #include <QDebug>
 #include <QMessageBox>
diff --git a/sdrbase/dsp/iirfilter.h b/sdrbase/dsp/iirfilter.h
index be05ffefe..c575796d0 100644
--- a/sdrbase/dsp/iirfilter.h
+++ b/sdrbase/dsp/iirfilter.h
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <assert.h>
 
 template <typename Type, uint32_t Order> class IIRFilter
 {
@@ -61,8 +60,6 @@ private:
 template <typename Type, uint32_t Order>
 IIRFilter<Type, Order>::IIRFilter(const Type *a, const Type *b)
 {
-    assert(Order > 1);
-
     m_a = new Type[Order+1];
     m_b = new Type[Order+1];
     m_x = new Type[Order];
diff --git a/sdrbase/dsp/samplesourcefifodb.cpp b/sdrbase/dsp/samplesourcefifodb.cpp
index f702cc7fd..d39e5be63 100644
--- a/sdrbase/dsp/samplesourcefifodb.cpp
+++ b/sdrbase/dsp/samplesourcefifodb.cpp
@@ -16,7 +16,6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <algorithm>
-#include <assert.h>
 #include "samplesourcefifodb.h"
 
 SampleSourceFifoDB::SampleSourceFifoDB(uint32_t size, QObject* parent) :
@@ -60,7 +59,7 @@ void SampleSourceFifoDB::init()
 void SampleSourceFifoDB::readAdvance(SampleVector::iterator& readUntil, unsigned int nbSamples)
 {
 //    QMutexLocker mutexLocker(&m_mutex);
-    assert(nbSamples <= m_size/2);
+    nbSamples = nbSamples > m_size/2 ? m_size/2 : nbSamples;
     emit dataWrite(nbSamples);
 
     m_ir = (m_ir + nbSamples) % m_size;
@@ -71,7 +70,7 @@ void SampleSourceFifoDB::readAdvance(SampleVector::iterator& readUntil, unsigned
 void SampleSourceFifoDB::readAdvance(SampleVector::const_iterator& readUntil, unsigned int nbSamples)
 {
 //    QMutexLocker mutexLocker(&m_mutex);
-    assert(nbSamples <= m_size/2);
+    nbSamples = nbSamples > m_size/2 ? m_size/2 : nbSamples;
     emit dataWrite(nbSamples);
 
     m_ir = (m_ir + nbSamples) % m_size;
diff --git a/sdrbase/dsp/samplesourcefifodb.h b/sdrbase/dsp/samplesourcefifodb.h
index 7062ae87f..a9b7bbbe2 100644
--- a/sdrbase/dsp/samplesourcefifodb.h
+++ b/sdrbase/dsp/samplesourcefifodb.h
@@ -21,7 +21,6 @@
 #include <QObject>
 #include <QMutex>
 #include <stdint.h>
-#include <assert.h>
 #include "export.h"
 #include "dsp/dsptypes.h"
 
diff --git a/sdrbase/util/db.cpp b/sdrbase/util/db.cpp
index 872d4e015..6b18d89ae 100644
--- a/sdrbase/util/db.cpp
+++ b/sdrbase/util/db.cpp
@@ -17,18 +17,16 @@
 
 #include "util/db.h"
 #include <cmath>
-#include <cassert>
 
 double CalcDb::dbPower(double magsq, double floor)
 {
-    assert(floor > 0.0);
-
-	if (magsq > floor)
-	{
-	    return 10.0 * log10(magsq);
+    if (floor <= 0.0) {
+		return -100.0;
 	}
-	else
-	{
+
+	if (magsq > floor) {
+	    return 10.0 * log10(magsq);
+	} else {
 		return 10.0 * log10(floor);
 	}
 }
diff --git a/sdrbase/util/udpsinkutil.h b/sdrbase/util/udpsinkutil.h
index 7abb63995..467b09480 100644
--- a/sdrbase/util/udpsinkutil.h
+++ b/sdrbase/util/udpsinkutil.h
@@ -24,8 +24,6 @@
 #include <QUdpSocket>
 #include <QHostAddress>
 
-#include <cassert>
-
 template<typename T>
 class UDPSinkUtil
 {
@@ -37,7 +35,6 @@ public:
 		m_port(9999),
 		m_sampleBufferIndex(0)
 	{
-        assert(m_udpSamples > 0);
 		m_sampleBuffer = new T[m_udpSamples];
 		m_socket = new QUdpSocket(parent);
 	}
@@ -49,7 +46,6 @@ public:
         m_port(port),
         m_sampleBufferIndex(0)
     {
-        assert(m_udpSamples > 0);
         m_sampleBuffer = new T[m_udpSamples];
         m_socket = new QUdpSocket(parent);
     }
@@ -61,7 +57,6 @@ public:
 		m_port(port),
 		m_sampleBufferIndex(0)
 	{
-		assert(m_udpSamples > 0);
 		m_sampleBuffer = new T[m_udpSamples];
 		m_socket = new QUdpSocket(parent);
 	}