diff --git a/src/gui/src/Fingerprint.cpp b/src/gui/src/Fingerprint.cpp
index be8b4017..24c8a1a3 100644
--- a/src/gui/src/Fingerprint.cpp
+++ b/src/gui/src/Fingerprint.cpp
@@ -17,7 +17,7 @@
 
 #include "Fingerprint.h"
 
-#include "CoreInterface.h"
+#include "common/DataDirectories.h"
 
 #include <QDir>
 #include <QTextStream>
@@ -125,8 +125,7 @@ void Fingerprint::persistDirectory()
 
 QString Fingerprint::directoryPath()
 {
-    CoreInterface coreInterface;
-    QString profileDir = coreInterface.getProfileDir();
+    auto profileDir = QString::fromStdString(DataDirectories::profile());
 
     return QString("%1/%2")
       .arg(profileDir)
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index b92e5f7c..bb3b9a55 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -31,6 +31,7 @@
 #include "ProcessorArch.h"
 #include "SslCertificate.h"
 #include "ShutdownCh.h"
+#include "common/DataDirectories.h"
 
 #include <QtCore>
 #include <QtGui>
@@ -1254,8 +1255,7 @@ void MainWindow::bonjourInstallFinished()
 
 QString MainWindow::getProfileRootForArg()
 {
-    CoreInterface coreInterface;
-    QString dir = coreInterface.getProfileDir();
+    auto dir = QString::fromStdString(DataDirectories::profile());
 
     // HACK: strip our app name since we're returning the root dir.
 #if defined(Q_OS_WIN)
diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp
index dc073134..15f7067f 100644
--- a/src/gui/src/SettingsDialog.cpp
+++ b/src/gui/src/SettingsDialog.cpp
@@ -18,7 +18,6 @@
 
 #include "SettingsDialog.h"
 
-#include "CoreInterface.h"
 #include "BarrierLocale.h"
 #include "QBarrierApplication.h"
 #include "QUtility.h"
diff --git a/src/gui/src/SettingsDialog.h b/src/gui/src/SettingsDialog.h
index c16b8218..b733bcc9 100644
--- a/src/gui/src/SettingsDialog.h
+++ b/src/gui/src/SettingsDialog.h
@@ -23,7 +23,6 @@
 #include <QDialog>
 #include "ui_SettingsDialogBase.h"
 #include "BarrierLocale.h"
-#include "CoreInterface.h"
 
 class AppConfig;
 
@@ -43,7 +42,6 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase
     private:
         AppConfig& m_appConfig;
         BarrierLocale m_Locale;
-        CoreInterface m_CoreInterface;
 
     private slots:
         void on_m_pComboLanguage_currentIndexChanged(int index);
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index 313e48b6..0cfdb81e 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -17,7 +17,6 @@
  
 #include "SetupWizard.h"
 #include "MainWindow.h"
-#include "WebClient.h"
 #include "QBarrierApplication.h"
 #include "QUtility.h"
 
diff --git a/src/gui/src/SslCertificate.cpp b/src/gui/src/SslCertificate.cpp
index 7de7eaac..9b31c5da 100644
--- a/src/gui/src/SslCertificate.cpp
+++ b/src/gui/src/SslCertificate.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "SslCertificate.h"
-
 #include "Fingerprint.h"
+#include "common/DataDirectories.h"
 
 #include <QProcess>
 #include <QDir>
@@ -37,7 +37,7 @@ static const char kConfigFile[] = "barrier.conf";
 SslCertificate::SslCertificate(QObject *parent) :
     QObject(parent)
 {
-    m_ProfileDir = m_CoreInterface.getProfileDir();
+    m_ProfileDir = QString::fromStdString(DataDirectories::profile());
     if (m_ProfileDir.isEmpty()) {
         emit error(tr("Failed to get profile directory."));
     }
diff --git a/src/gui/src/SslCertificate.h b/src/gui/src/SslCertificate.h
index 8acda4b2..8b209138 100644
--- a/src/gui/src/SslCertificate.h
+++ b/src/gui/src/SslCertificate.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "CoreInterface.h"
-
 #include <QObject>
 
 class SslCertificate : public QObject
@@ -43,5 +41,4 @@ private:
 private:
     QString m_ProfileDir;
     QString m_ToolOutput;
-    CoreInterface m_CoreInterface;
 };