diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index a3e06c16749..fa8193c9da7 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -17,7 +17,6 @@
 #include "library/dao/libraryhashdao.h"
 #include "library/dao/playlistdao.h"
 #include "library/library_prefs.h"
-#include "library/overviewcache.h"
 #include "library/queryutil.h"
 #include "moc_trackdao.cpp"
 #include "sources/soundsourceproxy.h"
diff --git a/src/library/tabledelegates/overviewdelegate.cpp b/src/library/tabledelegates/overviewdelegate.cpp
index 5af7d52538b..ec6f93fb689 100644
--- a/src/library/tabledelegates/overviewdelegate.cpp
+++ b/src/library/tabledelegates/overviewdelegate.cpp
@@ -44,11 +44,6 @@ OverviewDelegate::OverviewDelegate(QTableView* pTableView)
           m_pCache(OverviewCache::instance()),
           m_type(mixxx::OverviewType::RGB),
           m_inhibitLazyLoading(false) {
-    VERIFY_OR_DEBUG_ASSERT(m_pCache) {
-        kLogger.warning() << "Caching of overviews is not available";
-        return;
-    }
-
     WLibrary* pLibrary = findLibraryWidgetParent(pTableView);
     if (pLibrary) {
         m_signalColors = pLibrary->getOverviewSignalColors();
@@ -148,11 +143,6 @@ void OverviewDelegate::slotOverviewChanged(const TrackId trackId) {
 void OverviewDelegate::paintItem(QPainter* painter,
         const QStyleOptionViewItem& option,
         const QModelIndex& index) const {
-    if (!m_pCache) {
-        paintItemBackground(painter, option, index);
-        return;
-    }
-
     const TrackId trackId(m_pTrackModel->getTrackId(index));
     const double scaleFactor = m_pTableView->devicePixelRatioF();
     QPixmap pixmap = m_pCache->requestCachedOverview(m_type,
diff --git a/src/waveform/renderers/waveformoverviewrenderer.cpp b/src/waveform/renderers/waveformoverviewrenderer.cpp
index a7dee53dae9..362c1691cfa 100644
--- a/src/waveform/renderers/waveformoverviewrenderer.cpp
+++ b/src/waveform/renderers/waveformoverviewrenderer.cpp
@@ -3,17 +3,10 @@
 #include <QPainter>
 
 #include "util/colorcomponents.h"
-#include "util/logger.h"
 #include "util/math.h"
 #include "waveform/renderers/waveformsignalcolors.h"
 #include "waveform/waveformwidgetfactory.h"
 
-namespace {
-
-const mixxx::Logger kLogger("WaveformOverviewRenderer");
-
-} // anonymous namespace
-
 QImage WaveformOverviewRenderer::render(ConstWaveformPointer pWaveform,
         mixxx::OverviewType type,
         const WaveformSignalColors& signalColors,
diff --git a/src/waveform/renderers/waveformoverviewrenderer.h b/src/waveform/renderers/waveformoverviewrenderer.h
index 0ecc04a1427..825e4f2a341 100644
--- a/src/waveform/renderers/waveformoverviewrenderer.h
+++ b/src/waveform/renderers/waveformoverviewrenderer.h
@@ -10,7 +10,7 @@ class WaveformSignalColors;
 
 class WaveformOverviewRenderer {
   public:
-    static QImage render(ConstWaveformPointer,
+    static QImage render(ConstWaveformPointer pWaveform,
             mixxx::OverviewType type,
             const WaveformSignalColors& signalColors,
             bool mono = false);