diff --git a/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java b/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
index 9d0f740..4a03f72 100644
--- a/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
+++ b/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
@@ -7,16 +7,14 @@ import com.sekwah.advancedportals.core.util.InfoLogger;
 public class AdvancedPortalsCore {
 
     private static AdvancedPortalsCore instance;
-    private static CoreConnector coreConnector;
     private static DataStorage dataStorage;
     private static InfoLogger infoLogger;
     private static Config config;
 
-    public AdvancedPortalsCore(CoreConnector coreConnector, DataStorage dataStorage, InfoLogger infoLogger) {
+    public AdvancedPortalsCore(DataStorage dataStorage, InfoLogger infoLogger) {
         this.dataStorage = dataStorage;
         this.infoLogger = infoLogger;
         this.instance = this;
-        this.coreConnector = coreConnector;
         this.onEnable();
     }
 
@@ -40,12 +38,4 @@ public class AdvancedPortalsCore {
     public static InfoLogger getInfoLogger() {
         return infoLogger;
     }
-
-    public static CoreConnector getCoreConnector() {
-        return coreConnector;
-    }
-
-    public interface CoreConnector {
-        DataStorage getDataStorage();
-    }
 }
diff --git a/src/com/sekwah/advancedportals/core/util/DataStorage.java b/src/com/sekwah/advancedportals/core/util/DataStorage.java
index 71daef1..822b351 100644
--- a/src/com/sekwah/advancedportals/core/util/DataStorage.java
+++ b/src/com/sekwah/advancedportals/core/util/DataStorage.java
@@ -12,6 +12,7 @@ public class DataStorage {
     private File dataFolder;
 
     public DataStorage(File dataFolder) {
+        this.dataFolder = dataFolder;
         gson = new Gson();
     }