diff --git a/plugins/channeltx/modm17/m17mod.h b/plugins/channeltx/modm17/m17mod.h
index 53a7b56a2..e7dcc7c00 100644
--- a/plugins/channeltx/modm17/m17mod.h
+++ b/plugins/channeltx/modm17/m17mod.h
@@ -38,6 +38,7 @@ class QThread;
 class DeviceAPI;
 class M17ModBaseband;
 class ObjectPipe;
+class BasebandSampleSink;
 
 class M17Mod : public BasebandSampleSource, public ChannelAPI {
 public:
diff --git a/plugins/channeltx/modm17/m17modgui.cpp b/plugins/channeltx/modm17/m17modgui.cpp
index bfc2c7662..ab40f82e8 100644
--- a/plugins/channeltx/modm17/m17modgui.cpp
+++ b/plugins/channeltx/modm17/m17modgui.cpp
@@ -438,25 +438,6 @@ M17ModGUI::M17ModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
 	connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
 	connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
 
-	ui->screenTV->setColor(true);
-	ui->screenTV->resizeTVScreen(100,100);
-
-	m_scopeVisXY = new ScopeVisXY(ui->screenTV);
-	m_scopeVisXY->setScale(2.0);
-	m_scopeVisXY->setPixelsPerFrame(4001);
-	m_scopeVisXY->setPlotRGB(qRgb(0, 220, 250));
-	m_scopeVisXY->setGridRGB(qRgb(255, 255, 128));
-
-	for (float x = -0.84; x < 1.0; x += 0.56)
-	{
-		for (float y = -0.84; y < 1.0; y += 0.56)
-		{
-			m_scopeVisXY->addGraticulePoint(std::complex<float>(x, y));
-		}
-	}
-
-	m_scopeVisXY->calculateGraticule(100,100);
-
 	m_m17Mod = (M17Mod*) channelTx;
 	m_m17Mod->setMessageQueueToGUI(getInputMessageQueue());
 
@@ -503,8 +484,6 @@ M17ModGUI::M17ModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
 
 M17ModGUI::~M17ModGUI()
 {
-    delete m_scopeVisXY;
-    ui->screenTV->setParent(nullptr); // Prefer memory leak to core dump... ~TVScreen() is buggy
 	delete ui;
 }
 
@@ -578,10 +557,6 @@ void M17ModGUI::displaySettings()
     ui->aprsTo->lineEdit()->setText(m_settings.m_aprsTo);
     ui->aprsVia->lineEdit()->setText(m_settings.m_aprsVia);
 
-    m_scopeVisXY->setPixelsPerFrame(400*960); // 48000 / 50. Chunks of 50 ms.
-    m_scopeVisXY->setStroke(220);
-    m_scopeVisXY->setDecay(200);
-
     getRollupContents()->restoreState(m_rollupState);
     updateAbsoluteCenterFrequency();
     blockApplySettings(false);
diff --git a/plugins/channeltx/modm17/m17modgui.h b/plugins/channeltx/modm17/m17modgui.h
index ab47c225c..bd5922eeb 100644
--- a/plugins/channeltx/modm17/m17modgui.h
+++ b/plugins/channeltx/modm17/m17modgui.h
@@ -78,7 +78,6 @@ private:
     int m_basebandSampleRate;
     bool m_doApplySettings;
     bool m_fmAudioMode;
-    ScopeVisXY* m_scopeVisXY;
 
     M17Mod* m_m17Mod;
     MovingAverageUtil<double, double, 20> m_channelPowerDbAvg;
diff --git a/plugins/channeltx/modm17/m17modgui.ui b/plugins/channeltx/modm17/m17modgui.ui
index e7a3adeaa..d5e9d1951 100644
--- a/plugins/channeltx/modm17/m17modgui.ui
+++ b/plugins/channeltx/modm17/m17modgui.ui
@@ -1175,23 +1175,13 @@
     <item>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
-       <widget class="TVScreen" name="screenTV" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+       <widget class="QFrame" name="frame">
         <property name="minimumSize">
          <size>
-          <width>100</width>
+          <width>0</width>
           <height>100</height>
          </size>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
@@ -1355,12 +1345,6 @@
    <extends>QToolButton</extends>
    <header>gui/buttonswitch.h</header>
   </customwidget>
-  <customwidget>
-   <class>TVScreen</class>
-   <extends>QWidget</extends>
-   <header>gui/tvscreen.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LevelMeterVU</class>
    <extends>QWidget</extends>
diff --git a/plugins/channeltx/modm17/m17modsource.cpp b/plugins/channeltx/modm17/m17modsource.cpp
index a6ec47fee..65ec9928a 100644
--- a/plugins/channeltx/modm17/m17modsource.cpp
+++ b/plugins/channeltx/modm17/m17modsource.cpp
@@ -18,6 +18,7 @@
 #include <QDebug>
 
 #include "dsp/datafifo.h"
+#include "dsp/basebandsamplesink.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 
diff --git a/plugins/channeltx/modm17/m17modsource.h b/plugins/channeltx/modm17/m17modsource.h
index 096a072fd..0db44fc49 100644
--- a/plugins/channeltx/modm17/m17modsource.h
+++ b/plugins/channeltx/modm17/m17modsource.h
@@ -39,6 +39,7 @@
 
 class ChannelAPI;
 class M17ModProcessor;
+class BasebandSampleSink;
 
 class M17ModSource : public QObject, public ChannelSampleSource
 {