diff --git a/devsetup.cpp b/devsetup.cpp
index 52ed6a769..fd7550b30 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -245,7 +245,6 @@ void DevSetup::accept()
   // Check to see whether SoundInThread must be restarted,
   // and save user parameters.
 
-  qDebug() << "a";
   if(m_nDevIn!=ui.comboBoxSndIn->currentIndex() or
      m_paInDevice!=m_inDevList[m_nDevIn]) m_restartSoundIn=true;
 
@@ -293,12 +292,9 @@ void DevSetup::accept()
   m_dFreq.append(ui.f15->text());
   m_dFreq.append(ui.f16->text());
 
-  qDebug() << "b";
-
   if(m_bRigOpen) {
     rig->close();
     if(m_rig!=9999) delete rig;
-    qDebug() << "c";
     m_bRigOpen=false;
   }
 
@@ -446,12 +442,12 @@ void DevSetup::on_testCATButton_clicked()
   }
 
   rig = new Rig();
+
   if(m_rig != 9999) {
     if (!rig->init(m_rig)) {
       msgBox("Rig init failure");
       return;
     }
-
     rig->setConf("rig_pathname", m_catPort.toAscii().data());
     char buf[80];
     sprintf(buf,"%d",m_serialRate);
@@ -461,7 +457,6 @@ void DevSetup::on_testCATButton_clicked()
     sprintf(buf,"%d",m_stopBits);
     rig->setConf("stop_bits",buf);
     rig->setConf("serial_handshake",m_handshake.toAscii().data());
-
     if(m_bDTRoff) {
       rig->setConf("rts_state","OFF");
       rig->setConf("dtr_state","OFF");
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 153dd6e1c..93eff7948 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -641,7 +641,7 @@ void MainWindow::on_actionDeviceSetup_triggered()               //Setup Dialog
     rig->close();
     ui->readFreq->setStyleSheet("");
     ui->readFreq->setEnabled(false);
-    delete rig;
+    if(m_rig!=9999) delete rig;
     m_bRigOpen=false;
     m_catEnabled=false;
   }
@@ -2775,26 +2775,27 @@ void MainWindow::rigOpen()
   QString t;
   int ret;
   rig = new Rig();
+
   if(m_rig != 9999) {
     if (!rig->init(m_rig)) {
       msgBox("Rig init failure");
       return;
     }
+    rig->setConf("rig_pathname", m_catPort.toAscii().data());
+    char buf[80];
+    sprintf(buf,"%d",m_serialRate);
+    rig->setConf("serial_speed",buf);
+    sprintf(buf,"%d",m_dataBits);
+    rig->setConf("data_bits",buf);
+    sprintf(buf,"%d",m_stopBits);
+    rig->setConf("stop_bits",buf);
+    rig->setConf("serial_handshake",m_handshake.toAscii().data());
+    if(m_bDTRoff) {
+      rig->setConf("rts_state","OFF");
+      rig->setConf("dtr_state","OFF");
+    }
   }
 
-  rig->setConf("rig_pathname", m_catPort.toAscii().data());
-  char buf[80];
-  sprintf(buf,"%d",m_serialRate);
-  rig->setConf("serial_speed",buf);
-  sprintf(buf,"%d",m_dataBits);
-  rig->setConf("data_bits",buf);
-  sprintf(buf,"%d",m_stopBits);
-  rig->setConf("stop_bits",buf);
-  rig->setConf("serial_handshake",m_handshake.toAscii().data());
-  if(m_bDTRoff) {
-    rig->setConf("rts_state","OFF");
-    rig->setConf("dtr_state","OFF");
-  }
   ret=rig->open(m_rig);
   if(ret==RIG_OK) {
     m_bRigOpen=true;
diff --git a/rigclass.cpp b/rigclass.cpp
index 5f3caa476..fb47030e6 100644
--- a/rigclass.cpp
+++ b/rigclass.cpp
@@ -114,7 +114,6 @@ int Rig::setFreq(freq_t freq, vfo_t vfo) {
     QString t;
     int nhz=(int)freq;
     t=m_context + "Set Frequency-Hz " + QString::number(nhz);
-    qDebug() << "a" << freq << nhz << t;
     const wchar_t* cmnd = (const wchar_t*) t.utf16();
     const wchar_t* result=HRDInterfaceSendMessage(cmnd);
     QString t2=QString::fromWCharArray (result,-1);