diff --git a/map65/mainwindow.cpp b/map65/mainwindow.cpp
index 90b4a3029..60b81bc5c 100644
--- a/map65/mainwindow.cpp
+++ b/map65/mainwindow.cpp
@@ -116,10 +116,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
   QTimer *guiTimer = new QTimer(this);
   connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate()));
-
-  QTimer *m65Timer = new QTimer(this);
-  m65Timer->setSingleShot(true);
-  connect(m65Timer, SIGNAL(timeout()), this, SLOT(setup_m65()));
+  guiTimer->start(100);                            //Don't change the 100 ms!
 
   m_auto=false;
   m_waterfallAvg = 1;
@@ -296,10 +293,8 @@ MainWindow::MainWindow(QWidget *parent) :
   if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
   if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
 
-
-
-  m65Timer->start(200);
-  guiTimer->start(100);                            //Don't change the 100 ms!
+  m_dataDir = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
+  m_tempDir = QStandardPaths::writableLocation (QStandardPaths::TempLocation) + "/map65";
 
                                              // End of MainWindow constructor
 }
@@ -324,14 +319,6 @@ MainWindow::~MainWindow()
   delete ui;
 }
 
-void MainWindow::setup_m65()
-{
-  m_dataDir = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
-  m_tempDir = QStandardPaths::writableLocation (QStandardPaths::TempLocation) + "/map65";
-  memcpy(datcom_.datadir, m_dataDir.toLatin1(),m_dataDir.length());
-  memcpy(datcom_.tempdir, m_tempDir.toLatin1(),m_tempDir.length());
-}
-
 //-------------------------------------------------------- writeSettings()
 void MainWindow::writeSettings()
 {
diff --git a/map65/mainwindow.h b/map65/mainwindow.h
index 0e4689d1a..3847f2e7a 100644
--- a/map65/mainwindow.h
+++ b/map65/mainwindow.h
@@ -45,7 +45,6 @@ public slots:
   void guiUpdate();
   void doubleClickOnCall(QString hiscall, bool ctrl);
   void doubleClickOnMessages(QString hiscall, QString t2);
-  void setup_m65();
 
 protected:
   virtual void keyPressEvent( QKeyEvent *e );
@@ -265,6 +264,7 @@ private:
     SignalMeter *xSignalMeter;
     SignalMeter *ySignalMeter;
 
+
     SoundInThread soundInThread;             //Instantiate the audio threads
     SoundOutThread soundOutThread;