diff --git a/src/applesoftfile/ApplesoftRetokenizer.cpp b/src/applesoftfile/ApplesoftRetokenizer.cpp
index ddd35eb..b8c88a8 100644
--- a/src/applesoftfile/ApplesoftRetokenizer.cpp
+++ b/src/applesoftfile/ApplesoftRetokenizer.cpp
@@ -59,7 +59,7 @@ void ApplesoftRetokenizer::parse(quint16 start_address)
     m_data_end = idx;
 
     if (idx < m_data.length()) {
-        qDebug() << QString("%1 byte(s) unaccounted for.").arg(m_data.length() - idx);
+  //      qDebug() << QString("%1 byte(s) unaccounted for.").arg(m_data.length() - idx);
     }
 
     retokenizeLinesForFormatting();
diff --git a/src/diskfiles/dos33/catalogsector.cxx b/src/diskfiles/dos33/catalogsector.cxx
index dfc1434..5b39c2b 100644
--- a/src/diskfiles/dos33/catalogsector.cxx
+++ b/src/diskfiles/dos33/catalogsector.cxx
@@ -3,7 +3,7 @@
 
 CatalogSector::CatalogSector(Sector *data)
 {
-    qDebug() << "### Start CatalogSector ctor";
+ //   qDebug() << "### Start CatalogSector ctor";
     m_data = data;
 
     m_next = TSPair(0,0);
@@ -13,12 +13,12 @@ CatalogSector::CatalogSector(Sector *data)
     if (next.isValid() && next.track() == 17)
     {
         next.dump();
-        qDebug("Next track sector is valid.");
+    //    qDebug("Next track sector is valid.");
         m_next = next;
     }
     else
     {
-        qWarning() << "Track sector is invalid! Not adding to catalog.";
+        qWarning() << "Track sector " << next.track() << "," << next.sector() << "is invalid! Not adding to catalog.";
         m_next.dump();
     }
     //m_next.setTrack(m_data->rawData()[0x01]);
@@ -34,9 +34,9 @@ CatalogSector::CatalogSector(Sector *data)
             }
             else qDebug() << "Not appending invalid TSPair.";
         }
-        else { qWarning("fde.firstTSListSector() is 0,0"); }
+    //    else { qWarning("fde.firstTSListSector() is 0,0"); }
     }
-    qDebug() << "### End CatalogSector ctor";
+  //  qDebug() << "### End CatalogSector ctor";
 }
 
 void CatalogSector::dumpFDEs() {
diff --git a/src/diskfiles/dos33/diskfile.cxx b/src/diskfiles/dos33/diskfile.cxx
index 573fc19..a6e93d7 100644
--- a/src/diskfiles/dos33/diskfile.cxx
+++ b/src/diskfiles/dos33/diskfile.cxx
@@ -56,7 +56,7 @@ bool DiskFile::read(QString filename)
                 char buffer[256];
                 if (qds.readRawData(buffer,256) == 256)
                 {
-                    qDebug() << "Track " << track << " Sector " << sector;
+       //             qDebug() << "Track " << track << " Sector " << sector;
                     Sector sec;
                     sec.setTrackSector(track,sector);
                     sec.setData(QByteArray(buffer,256));
@@ -72,7 +72,7 @@ bool DiskFile::read(QString filename)
         hash.addData(contents);
 
         m_hash = hash.result();
-        qDebug() << "Hash: " << m_hash;
+   //     qDebug() << "Hash: " << m_hash;
 
         return true;
     }
@@ -88,7 +88,7 @@ VTOC DiskFile::getVTOC()
 
 QList<CatalogSector> DiskFile::getCatalogSectors()
 {
-    qDebug() << "### Start getCatalogSector";
+  //  qDebug() << "### Start getCatalogSector";
 
     QList<CatalogSector> retval;
     VTOC vtoc = getVTOC();
@@ -101,7 +101,7 @@ QList<CatalogSector> DiskFile::getCatalogSectors()
         cs = getSector(ts).promoteToCatalogSector();
         retval.append(cs);
     }
-    qDebug() << "### End getCatalogSector";
+  //  qDebug() << "### End getCatalogSector";
 
     return retval;
 }
@@ -189,7 +189,7 @@ QByteArray DiskFile::getDataFromTrackSectorList(TrackSectorList tsl)
 
 QList<FileDescriptiveEntry> DiskFile::getAllFDEs()
 {
-    qDebug() << "### Start getAllFDEs";
+ //   qDebug() << "### Start getAllFDEs";
     QList<FileDescriptiveEntry> retval;
 
     QList<CatalogSector>  sectors = getCatalogSectors();
@@ -199,7 +199,7 @@ QList<FileDescriptiveEntry> DiskFile::getAllFDEs()
         QList<FileDescriptiveEntry> fdes = cs.getFDEs();
         retval.append(fdes);
     }
-    qDebug() << "### End getAllFDEs";
+ //   qDebug() << "### End getAllFDEs";
     return retval;
 }
 
diff --git a/src/ui/catalogwidget.cxx b/src/ui/catalogwidget.cxx
index 859a4af..561de3a 100644
--- a/src/ui/catalogwidget.cxx
+++ b/src/ui/catalogwidget.cxx
@@ -77,7 +77,7 @@ QString CatalogWidget::createToolTip(FileDescriptiveEntry &fde) {
 
 void CatalogWidget::processNewlyLoadedDisk(QString diskfilename, DiskFile *disk)
 {
-    qDebug() << "### Start processNewlyLoadedDisk";
+   // qDebug() << "### Start processNewlyLoadedDisk";
     if (m_disk == disk) {
         QUrl url = QUrl::fromLocalFile(diskfilename);
         QString shortfilename = url.fileName();
@@ -86,7 +86,7 @@ void CatalogWidget::processNewlyLoadedDisk(QString diskfilename, DiskFile *disk)
         ui->volume_label->setText(shortfilename);
         int idx = 0;
         foreach(FileDescriptiveEntry fde, m_disk->getAllFDEs()) {
-            qDebug() << "    Processing FDE# " << idx;
+    //        qDebug() << "    Processing FDE# " << idx;
             QString filetype = fde.fileType();
             QString filename = AppleString(fde.filename).printable().trimmed();
             quint16 size = fde.lengthInSectors;
@@ -113,7 +113,7 @@ void CatalogWidget::processNewlyLoadedDisk(QString diskfilename, DiskFile *disk)
                 maxrect = rect;
             }
             idx++;
-            qDebug() << "    Done Processing FDE# " << idx-1;
+      //      qDebug() << "    Done Processing FDE# " << idx-1;
         }
         //        QFont italfont = ui->catalog_list->font();
         //        italfont.setItalic(true);
@@ -131,7 +131,7 @@ void CatalogWidget::processNewlyLoadedDisk(QString diskfilename, DiskFile *disk)
 
         ui->catalog_list->resize(maxrect.width(),ui->catalog_list->size().height());
     }
-    qDebug() << "### End processNewlyLoadedDisk";
+  //  qDebug() << "### End processNewlyLoadedDisk";
 }
 
 void CatalogWidget::unloadDisk(DiskFile *disk)
diff --git a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp
index 6c2cc3d..d50bdd2 100644
--- a/src/ui/diskexplorer/DiskExplorerMapWidget.cpp
+++ b/src/ui/diskexplorer/DiskExplorerMapWidget.cpp
@@ -242,7 +242,7 @@ QGroupBox *DiskExplorerMapWidget::makeKeyWidget()
 
 DEButton *DiskExplorerMapWidget::buttonAt(int track, int sector)
 {
-    qDebug() << "Button At:" << track << "," << sector;
+    //qDebug() << "Button At:" << track << "," << sector;
     if (track >= m_numtracks || sector >= m_numsectors)
     {
         if (track >= m_numtracks) { track = 0; }
diff --git a/src/ui/viewers/hexdumpviewer.cpp b/src/ui/viewers/hexdumpviewer.cpp
index e22ebf7..80946b0 100644
--- a/src/ui/viewers/hexdumpviewer.cpp
+++ b/src/ui/viewers/hexdumpviewer.cpp
@@ -191,7 +191,7 @@ void HexDumpViewer::setTextFont(const QFont &font, int forcedFontSize)
 {
     QFont myfont = font;
     if (forcedFontSize > 0) { myfont.setPointSize(forcedFontSize); }
-    qDebug() << "######################### Setting text font size " << myfont.pointSize();
+ //   qDebug() << "######################### Setting text font size " << myfont.pointSize();
     ui->textArea->setFont(myfont);
 
 }
diff --git a/src/util/util.h b/src/util/util.h
index f3f1667..6147c5e 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -74,7 +74,9 @@ struct TSPair {
         return !(operator==(other));
     }
 
-    void dump() const { qDebug() << "TSPair: track: " << track() << " sector: " << sector(); }
+    void dump() const {
+        //qDebug() << "TSPair: track: " << track() << " sector: " << sector();
+    }
 private:
     quint8 m_track;
     quint8 m_sector;