diff --git a/Client/.env.example b/Client/.env.example
index b9a73b6..f5b9367 100644
--- a/Client/.env.example
+++ b/Client/.env.example
@@ -19,7 +19,6 @@ CLIENT_NAME=""
 CLIENT_IP=""
 CLIENT_PORT=3010
 CLIENT_LOCATION=""
-CLIENT_NEARBY_SYSTEMS=""
 CLIENT_ONLINE=true
 
 # Configuration for the connection to the server
diff --git a/Client/config/core.js.default b/Client/config/core.js.default
deleted file mode 100644
index 4184040..0000000
--- a/Client/config/core.js.default
+++ /dev/null
@@ -1,16 +0,0 @@
-// Core config settings for the node, these are the settings that are checked with the server
-exports.nodeConfig = {
-    "id": 0,
-    "name": "",
-    "ip": "",
-    "port": 0,
-    "location": "",
-    "nearbySystems": {
-        "System Name": {
-            "frequencies": [],
-            "mode": "",
-            "trunkFile": ""
-        }
-    },
-    "online": false
-}
\ No newline at end of file
diff --git a/Client/controllers/clientController.js b/Client/controllers/clientController.js
index cad4652..c6b2071 100644
--- a/Client/controllers/clientController.js
+++ b/Client/controllers/clientController.js
@@ -8,10 +8,10 @@ const modes = require("../config/modes");
 const { executeAsyncConsoleCommand, nodeObject } = require("../utilities/utilities");
 // Utilities
 const { updateId, updateConfig } = require("../utilities/updateConfig");
-const {updatePreset, addNewPreset, getPresets, removePreset} = require("../utilities/updatePresets");
+const { updatePreset, addNewPreset, getPresets, removePreset } = require("../utilities/updatePresets");
 const { onHttpError, requestOptions, sendHttpRequest } = require("../utilities/httpRequests");
 
-var runningClientConfig = new nodeObject({_id: process.env.CLIENT_ID, _ip: process.env.CLIENT_IP, _name: process.env.CLIENT_NAME, _port: process.env.CLIENT_PORT, _location: process.env.CLIENT_LOCATION, _nearbySystems: process.env.CLIENT_NEARBY_SYSTEMS, _online: process.env.CLIENT_ONLINE});
+var runningClientConfig = new nodeObject({_id: process.env.CLIENT_ID, _ip: process.env.CLIENT_IP, _name: process.env.CLIENT_NAME, _port: process.env.CLIENT_PORT, _location: process.env.CLIENT_LOCATION, _nearbySystems: getPresets(), _online: process.env.CLIENT_ONLINE});
 
 /**
  * Check the body for the required fields to update or add a preset