diff --git a/wfmain.cpp b/wfmain.cpp
index c55d6cc..2877d76 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1048,7 +1048,6 @@ void wfmain::setUIToPrefs()
 
     ui->drawPeakChk->setChecked(prefs.drawPeaks);
     on_drawPeakChk_clicked(prefs.drawPeaks);
-    drawPeaks = prefs.drawPeaks;
 
     underlayMode = prefs.underlayMode;
     switch(underlayMode)
@@ -3591,9 +3590,6 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
     //spectrumPlasma.resize(spectrumPlasmaSize);
     plasmaMutex.unlock();
 
-    // HACK DO NOT CHECK IN:
-    drawPeaks = false;
-    drawPlasma = true;
 
     if(!spectrumDrawLock)
     {
@@ -3678,7 +3674,6 @@ void wfmain::computePlasma()
         }
     }
     plasmaMutex.unlock();
-
 }
 
 void wfmain::receiveSpectrumMode(spectrumMode spectMode)
@@ -3882,10 +3877,8 @@ void wfmain::on_drawPeakChk_clicked(bool checked)
     if(checked)
     {
         on_clearPeakBtn_clicked(); // clear
-        drawPeaks = true;
 
     } else {
-        drawPeaks = false;
 
 #if QCUSTOMPLOT_VERSION >= 0x020000
         plot->graph(1)->data()->clear();
diff --git a/wfmain.h b/wfmain.h
index 55fc8d2..6ec4a6d 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -672,7 +672,6 @@ private:
     QVector <QByteArray> spectrumPlasma;
     unsigned int spectrumPlasmaSize = 64;
     underlay_t underlayMode = underlayNone;
-    bool drawPlasma = true;
     QMutex plasmaMutex;
     void resizePlasmaBuffer(int newSize);
 
@@ -687,7 +686,6 @@ private:
     unsigned int wfLengthMax;
 
     bool onFullscreen;
-    bool drawPeaks;
     bool freqTextSelected;
     void checkFreqSel();
 
diff --git a/wfmain.ui b/wfmain.ui
index 2e0d107..a935e8c 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -18,7 +18,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>3</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="mainTab">
        <attribute name="title">
@@ -2974,7 +2974,7 @@
                 <item>
                  <widget class="QLabel" name="label_42">
                   <property name="text">
-                   <string>Uneerlay Buffer Size:</string>
+                   <string>Underlay Buffer Size:</string>
                   </property>
                  </widget>
                 </item>