diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp
index 1e5cb95c2..c17c5b656 100644
--- a/src/blackgui/guiutility.cpp
+++ b/src/blackgui/guiutility.cpp
@@ -217,23 +217,6 @@ namespace BlackGui
         return (mw) ? mw->getWidget()->pos() : QPoint();
     }
 
-    QPoint CGuiUtility::introWindowPosition()
-    {
-        QWidgetList tlw = topLevelApplicationWidgetsWithName();
-        foreach(QWidget * w, tlw)
-        {
-            QString n = w->objectName().toLower();
-            if (n.contains("intro")) { return w->pos(); }
-        }
-        return QPoint(0, 0);
-    }
-
-    QPoint CGuiUtility::assumedMainWindowPosition()
-    {
-        QPoint p = mainWindowPosition();
-        return (p.isNull()) ? introWindowPosition() : p;
-    }
-
     QString CGuiUtility::replaceTabCountValue(const QString &oldName, int count)
     {
         const QString v = QString(" (").append(QString::number(count)).append(")");
diff --git a/src/blackgui/guiutility.h b/src/blackgui/guiutility.h
index db25ea778..3716ba9e3 100644
--- a/src/blackgui/guiutility.h
+++ b/src/blackgui/guiutility.h
@@ -41,12 +41,6 @@ namespace BlackGui
         //! Position of main window
         static QPoint mainWindowPosition();
 
-        //! Position of intro window
-        static QPoint introWindowPosition();
-
-        //! During initialization, when main window position might not be set set
-        static QPoint assumedMainWindowPosition();
-
         //! Replace count in name such as "stations (4)"
         static QString replaceTabCountValue(const QString &oldName, int count);
 
diff --git a/src/swiftguistandard/guimodeenums.h b/src/swiftguistandard/guimodeenums.h
index 477dbd452..fdeb5dab8 100644
--- a/src/swiftguistandard/guimodeenums.h
+++ b/src/swiftguistandard/guimodeenums.h
@@ -20,8 +20,8 @@ public:
     enum CoreMode
     {
         CoreInGuiProcess,
-        CoreExternal,
-        CoreExternalAudioLocal
+        CoreExternalCoreAudio,
+        CoreExternalAudioGui
     };
 
     //! String to core mode
@@ -29,14 +29,14 @@ public:
     {
         QString cm(m.toLower().trimmed());
         if (cm.isEmpty()) { return CoreInGuiProcess; }
-        if (m == coreModeToString(CoreExternal)) { return CoreExternal; }
+        if (m == coreModeToString(CoreExternalCoreAudio)) { return CoreExternalCoreAudio; }
         if (m == coreModeToString(CoreInGuiProcess)) { return CoreInGuiProcess; }
-        if (m == coreModeToString(CoreExternalAudioLocal)) { return CoreExternalAudioLocal; }
+        if (m == coreModeToString(CoreExternalAudioGui)) { return CoreExternalAudioGui; }
 
         // some alternative names
-        if (cm.contains("audiolocal")) { return CoreExternalAudioLocal; }
-        if (cm.contains("localaudio")) { return CoreExternalAudioLocal; }
-        if (cm.contains("external")) { return CoreExternal; }
+        if (cm.contains("audiolocal")) { return CoreExternalAudioGui; }
+        if (cm.contains("localaudio")) { return CoreExternalAudioGui; }
+        if (cm.contains("external")) { return CoreExternalCoreAudio; }
         if (cm.contains("gui")) { return CoreInGuiProcess; }
         return CoreInGuiProcess;
     }
@@ -47,8 +47,8 @@ public:
         switch (mode)
         {
         case CoreInGuiProcess: return "coreinguiprocess";
-        case CoreExternal: return "coreexternal";
-        case CoreExternalAudioLocal: return "coreexternalaudiolocal";
+        case CoreExternalCoreAudio: return "coreexternal";
+        case CoreExternalAudioGui: return "coreexternalaudiogui";
         }
         return "";
     }
diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp
index fc87720ab..520c974c7 100644
--- a/src/swiftguistandard/main.cpp
+++ b/src/swiftguistandard/main.cpp
@@ -130,13 +130,13 @@ int main(int argc, char *argv[])
     BlackCore::CRuntimeConfig runtimeConfig;
     switch (coreMode)
     {
-    case GuiModes::CoreExternal:
+    case GuiModes::CoreExternalCoreAudio:
         runtimeConfig = CRuntimeConfig::remote(dBusAddress);
         break;
     case GuiModes::CoreInGuiProcess:
         runtimeConfig = CRuntimeConfig::local(dBusAddress);
         break;
-    case GuiModes::CoreExternalAudioLocal:
+    case GuiModes::CoreExternalAudioGui:
         runtimeConfig = CRuntimeConfig::remoteLocalAudio(dBusAddress);
         break;
     }
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index 678aa2067..69c228769 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -55,7 +55,7 @@ SwiftGuiStd::~SwiftGuiStd()
 
 void SwiftGuiStd::mouseMoveEvent(QMouseEvent *event)
 {
-    if (!handleMousePressEvent(event)) { QMainWindow::mouseMoveEvent(event); }
+    if (!handleMouseMoveEvent(event)) { QMainWindow::mouseMoveEvent(event); }
 }
 
 void SwiftGuiStd::mousePressEvent(QMouseEvent *event)
diff --git a/src/swiftguistandard/swiftguistd_init.cpp b/src/swiftguistandard/swiftguistd_init.cpp
index 28e5dc8f7..da60f4e26 100644
--- a/src/swiftguistandard/swiftguistd_init.cpp
+++ b/src/swiftguistandard/swiftguistd_init.cpp
@@ -41,8 +41,6 @@ void SwiftGuiStd::init(const CRuntimeConfig &runtimeConfig)
     this->setWindowTitle(CProject::versionStringDevBetaInfo());
     this->setObjectName("SwiftGuiStd");
     this->initStyleSheet();
-    QPoint pos = CGuiUtility::introWindowPosition();
-    this->move(pos);
 
     // with frameless window, we shift menu and statusbar into central widget
     // http://stackoverflow.com/questions/18316710/frameless-and-transparent-window-qt5