diff --git a/src/app/containers/Firmware/components/defaultMachineProfiles.js b/src/app/containers/Firmware/components/defaultMachineProfiles.js
index fab9e8f48..5e41eb145 100644
--- a/src/app/containers/Firmware/components/defaultMachineProfiles.js
+++ b/src/app/containers/Firmware/components/defaultMachineProfiles.js
@@ -21,7 +21,6 @@
  *
  */
 
-import DefaultSLBSettings from '../eepromFiles/DefaultSLBSettings.json';
 import * as longMillGrblEEPROM from '../eeprom/grbl/longmill';
 import * as longMillGrblHALEEPROM from '../eeprom/grblHAL/longmill';
 import * as millOneGrblEEPROM from '../eeprom/grbl/millone';
@@ -31,52 +30,57 @@ export default [
     {
         id: 0,
         company: 'Sienci Labs',
-        name: 'LongMill MK2',
-        type: '30x30',
-        version: 'MK2',
+        name: 'Altmill 48x48',
+        type: '',
+        version: '',
         mm: {
-            width: 792,
-            depth: 845,
-            height: 114.3
+            width: 1260,
+            depth: 1248,
+            height: 170
         },
         in: {
             width: 31.18,
             depth: 33.27,
             height: 4.5
         },
-        endstops: false,
+        endstops: true,
         spindle: false,
         coolant: false,
         laser: false,
         laserOnOutline: false,
-        eepromSettings: longMillGrblEEPROM.LONGMILL_MK2_30x30,
-        grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK2_30x30
+        eepromSettings: altmillSettings.DEFAULT,
+        grblHALeepromSettings: altmillSettings.DEFAULT,
+        orderedSettings: altmillSettings.ALTMILL_ORDERED,
+        isHal: true
     },
     {
         id: 1,
         company: 'Sienci Labs',
-        name: 'LongMill MK2',
-        type: '48x30',
-        version: 'MK2',
+        name: 'Altmill 48x48 + Spindle',
+        type: '',
+        version: '',
         mm: {
-            width: 1279.9,
-            depth: 845,
-            height: 114.3
+            width: 49.6,
+            depth: 49.1,
+            height: 6.6
         },
         in: {
-            width: 50.39,
-            depth: 33.27,
-            height: 4.5
+            width: 49.6,
+            depth: 49.1,
+            height: 6.6
         },
-        endstops: false,
-        spindle: false,
+        endstops: true,
+        spindle: true,
         coolant: false,
         laser: false,
-        eepromSettings: longMillGrblEEPROM.LONGMILL_MK2_48x30,
-        grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK2_48x30
+        laserOnOutline: false,
+        eepromSettings: altmillSettings.SPINDLE_KIT,
+        grblHALeepromSettings: altmillSettings.SPINDLE_KIT,
+        orderedSettings: altmillSettings.SPINDLE_ORDERED,
+        isHal: true
     },
     {
-        id: 2,
+        id: 5,
         company: 'Sienci Labs',
         name: 'LongMill MK2',
         type: '12x30',
@@ -100,76 +104,54 @@ export default [
         grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK2_12x30
     },
     {
-        id: 7,
-        company: 'Sienci Labs',
-        name: 'Mill One',
-        type: 'V1',
-        version: 'MK1',
-        mm: {
-            width: 234,
-            depth: 185,
-            height: 90
-        },
-        in: {
-            width: 9.21,
-            depth: 7.28,
-            height: 3.54
-        },
-        endstops: false,
-        spindle: false,
-        coolant: false,
-        laser: false,
-        laserOnOutline: false,
-        eepromSettings: millOneGrblEEPROM.MILL_ONE_V1_AND_V2,
-    },
-    {
-        id: 8,
+        id: 6,
         company: 'Sienci Labs',
-        name: 'Mill One',
-        type: 'V2',
-        version: 'MK1',
+        name: 'LongMill MK2',
+        type: '30x30',
+        version: 'MK2',
         mm: {
-            width: 234,
-            depth: 185,
-            height: 90
+            width: 792,
+            depth: 845,
+            height: 114.3
         },
         in: {
-            width: 9.21,
-            depth: 7.28,
-            height: 3.54
+            width: 31.18,
+            depth: 33.27,
+            height: 4.5
         },
         endstops: false,
         spindle: false,
         coolant: false,
         laser: false,
         laserOnOutline: false,
-        eepromSettings: millOneGrblEEPROM.MILL_ONE_V1_AND_V2,
+        eepromSettings: longMillGrblEEPROM.LONGMILL_MK2_30x30,
+        grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK2_30x30
     },
     {
-        id: 9,
+        id: 7,
         company: 'Sienci Labs',
-        name: 'Mill One',
-        type: 'V3',
-        version: 'MK1',
+        name: 'LongMill MK2',
+        type: '48x30',
+        version: 'MK2',
         mm: {
-            width: 258,
-            depth: 185,
-            height: 90
+            width: 1279.9,
+            depth: 845,
+            height: 114.3
         },
         in: {
-            width: 10.16,
-            depth: 7.28,
-            height: 3.54
+            width: 50.39,
+            depth: 33.27,
+            height: 4.5
         },
         endstops: false,
         spindle: false,
         coolant: false,
         laser: false,
-        laserOnOutline: false,
-        eepromSettings: millOneGrblEEPROM.MILL_ONE_V3,
+        eepromSettings: longMillGrblEEPROM.LONGMILL_MK2_48x30,
+        grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK2_48x30
     },
     {
-        id: 3,
+        id: 10,
         company: 'Sienci Labs',
         name: 'LongMill MK1',
         type: '12x12',
@@ -193,7 +175,7 @@ export default [
         grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK1_12x12
     },
     {
-        id: 4,
+        id: 11,
         company: 'Sienci Labs',
         name: 'LongMill MK1',
         type: '12x30',
@@ -217,7 +199,7 @@ export default [
         grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK1_12x30
     },
     {
-        id: 5,
+        id: 12,
         company: 'Sienci Labs',
         name: 'LongMill MK1',
         type: '30x30',
@@ -241,7 +223,7 @@ export default [
         grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK1_30x30
     },
     {
-        id: 6,
+        id: 13,
         company: 'Sienci Labs',
         name: 'LongMill MK1',
         type: '48x30',
@@ -264,7 +246,97 @@ export default [
         grblHALeepromSettings: longMillGrblHALEEPROM.LONGMILL_MK1_48x30
     },
     {
-        id: 10,
+        id: 15,
+        company: 'Sienci Labs',
+        name: 'Mill One',
+        type: 'V1',
+        version: 'MK1',
+        mm: {
+            width: 234,
+            depth: 185,
+            height: 90
+        },
+        in: {
+            width: 9.21,
+            depth: 7.28,
+            height: 3.54
+        },
+        endstops: false,
+        spindle: false,
+        coolant: false,
+        laser: false,
+        laserOnOutline: false,
+        eepromSettings: millOneGrblEEPROM.MILL_ONE_V1_AND_V2,
+    },
+    {
+        id: 16,
+        company: 'Sienci Labs',
+        name: 'Mill One',
+        type: 'V2',
+        version: 'MK1',
+        mm: {
+            width: 234,
+            depth: 185,
+            height: 90
+        },
+        in: {
+            width: 9.21,
+            depth: 7.28,
+            height: 3.54
+        },
+        endstops: false,
+        spindle: false,
+        coolant: false,
+        laser: false,
+        laserOnOutline: false,
+        eepromSettings: millOneGrblEEPROM.MILL_ONE_V1_AND_V2,
+    },
+    {
+        id: 17,
+        company: 'Sienci Labs',
+        name: 'Mill One',
+        type: 'V3',
+        version: 'MK1',
+        mm: {
+            width: 258,
+            depth: 185,
+            height: 90
+        },
+        in: {
+            width: 10.16,
+            depth: 7.28,
+            height: 3.54
+        },
+        endstops: false,
+        spindle: false,
+        coolant: false,
+        laser: false,
+        laserOnOutline: false,
+        eepromSettings: millOneGrblEEPROM.MILL_ONE_V3,
+    },
+    {
+        id: 30,
+        company: '',
+        name: 'Generic CNC',
+        type: '',
+        mm: {
+            width: 530,
+            depth: 450,
+            height: 465
+        },
+        in: {
+            width: 20.8,
+            depth: 17.7,
+            height: 18.3
+        },
+        endstops: false,
+        spindle: false,
+        coolant: false,
+        laser: false,
+        laserOnOutline: false,
+    },
+    {
+        id: 31,
         company: '',
         name: 'Shapeoko',
         type: '',
@@ -284,7 +356,7 @@ export default [
         laser: false
     },
     {
-        id: 18,
+        id: 32,
         company: '',
         name: 'X-Carve',
         type: '',
@@ -305,7 +377,7 @@ export default [
         laserOnOutline: false,
     },
     {
-        id: 19,
+        id: 33,
         company: '',
         name: 'Nomad',
         type: '',
@@ -326,7 +398,7 @@ export default [
         laserOnOutline: false,
     },
     {
-        id: 22,
+        id: 34,
         company: '',
         name: 'Onefinity',
         type: '',
@@ -347,7 +419,7 @@ export default [
         laserOnOutline: false,
     },
     {
-        id: 23,
+        id: 35,
         company: '',
         name: 'OpenBuilds',
         type: '',
@@ -368,7 +440,7 @@ export default [
         laserOnOutline: false,
     },
     {
-        id: 33,
+        id: 36,
         company: '',
         name: 'Ooznest',
         type: '',
@@ -389,7 +461,7 @@ export default [
         laserOnOutline: false,
     },
     {
-        id: 34,
+        id: 37,
         company: '',
         name: 'MillRight',
         type: '',
@@ -534,103 +606,5 @@ export default [
         coolant: false,
         laser: false,
         laserOnOutline: false,
-    },
-    {
-        id: 52,
-        company: '',
-        name: 'Generic CNC',
-        type: '',
-        mm: {
-            width: 530,
-            depth: 450,
-            height: 465
-        },
-        in: {
-            width: 20.8,
-            depth: 17.7,
-            height: 18.3
-        },
-        endstops: false,
-        spindle: false,
-        coolant: false,
-        laser: false,
-        laserOnOutline: false,
-    },
-    {
-        id: 53,
-        company: 'Sienci Labs',
-        name: 'SLB',
-        type: '',
-        version: '',
-        mm: {
-            width: 792,
-            depth: 845,
-            height: 114.3
-        },
-        in: {
-            width: 31.18,
-            depth: 33.27,
-            height: 4.5
-        },
-        endstops: false,
-        spindle: false,
-        coolant: false,
-        laser: false,
-        laserOnOutline: false,
-        eepromSettings: DefaultSLBSettings,
-        grblHALeepromSettings: DefaultSLBSettings,
-        isHal: true
-    },
-    {
-        id: 54,
-        company: 'Sienci Labs',
-        name: 'Altmill 48X48',
-        type: '',
-        version: '',
-        mm: {
-            width: 1260,
-            depth: 1248,
-            height: 170
-        },
-        in: {
-            width: 31.18,
-            depth: 33.27,
-            height: 4.5
-        },
-        endstops: true,
-        spindle: false,
-        coolant: false,
-        laser: false,
-        laserOnOutline: false,
-        eepromSettings: altmillSettings.DEFAULT,
-        grblHALeepromSettings: altmillSettings.DEFAULT,
-        orderedSettings: altmillSettings.ALTMILL_ORDERED,
-        isHal: true
-    },
-    {
-        id: 55,
-        company: 'Sienci Labs',
-        name: 'Altmill 48X48 + Spindle',
-        type: '',
-        version: '',
-        mm: {
-            width: 49.6,
-            depth: 49.1,
-            height: 6.6
-        },
-        in: {
-            width: 49.6,
-            depth: 49.1,
-            height: 6.6
-        },
-        endstops: true,
-        spindle: true,
-        coolant: false,
-        laser: false,
-        laserOnOutline: false,
-        eepromSettings: altmillSettings.SPINDLE_KIT,
-        grblHALeepromSettings: altmillSettings.SPINDLE_KIT,
-        orderedSettings: altmillSettings.SPINDLE_ORDERED,
-        isHal: true
     }
 ];
diff --git a/src/app/containers/Firmware/eeprom/grbl/longmill.js b/src/app/containers/Firmware/eeprom/grbl/longmill.js
index b3d9d68b4..383e203b2 100644
--- a/src/app/containers/Firmware/eeprom/grbl/longmill.js
+++ b/src/app/containers/Firmware/eeprom/grbl/longmill.js
@@ -4,6 +4,7 @@ export const LONGMILL_MASTER_LIST_GRBL = {
     $0: '10',
     $1: '100',
     $2: '1',
+    // $3: "* Some value *",
     $4: '1',
     $5: '0',
     $6: '0',
@@ -30,7 +31,10 @@ export const LONGMILL_MASTER_LIST_GRBL = {
     $112: '3000.000',
     $120: '750.000',
     $121: '750.000',
-    $122: '500.000',
+    $122: '500.000'
+    // $130: "* Some value *"
+    // $131: "* Some value *"
+    // $132: "* Some value *"
 };
 
 export const LONGMILL_MK1_12x12 = {
diff --git a/src/app/containers/Firmware/eeprom/grbl/millone.js b/src/app/containers/Firmware/eeprom/grbl/millone.js
index 8965f0f0b..30390c2af 100644
--- a/src/app/containers/Firmware/eeprom/grbl/millone.js
+++ b/src/app/containers/Firmware/eeprom/grbl/millone.js
@@ -1,9 +1,9 @@
 const MILL_ONE_MASTER_LIST = {
     $0: '10',
-    $1: '100',
-    $2: '1',
+    $1: '25',
+    $2: '0',
     $3: '6',
-    $4: '1',
+    $4: '0',
     $5: '0',
     $6: '0',
     $10: '1',
@@ -13,25 +13,26 @@ const MILL_ONE_MASTER_LIST = {
     $20: '0',
     $21: '0',
     $22: '0',
-    $23: '3',
+    $23: '0',
     $24: '25.000',
-    $25: '1500.000',
+    $25: '500.000',
     $26: '250',
     $27: '1.000',
-    $30: '30000',
-    $31: '10000',
+    $30: '1000',
+    $31: '0',
     $32: '0',
     $100: '200.000',
     $101: '200.000',
     $102: '200.000',
-    $110: '4000.000',
-    $111: '4000.000',
-    $112: '3000.000',
-    $120: '750.000',
-    $121: '750.000',
-    $122: '500.000',
-    $131: '750.000',
-    $132: '500.000',
+    $110: '1800.000',
+    $111: '1800.000',
+    $112: '600.000',
+    $120: '30.000',
+    $121: '30.000',
+    $122: '15.000',
+    // $130: "* Some value *"
+    $131: '185.000',
+    $132: '100.000'
 };
 
 export const MILL_ONE_V1_AND_V2 = {
diff --git a/src/app/containers/Firmware/eepromFiles/DefaultSLBSettings.json b/src/app/containers/Firmware/eepromFiles/DefaultSLBSettings.json
deleted file mode 100644
index b95c701b4..000000000
--- a/src/app/containers/Firmware/eepromFiles/DefaultSLBSettings.json
+++ /dev/null
@@ -1,188 +0,0 @@
- {
-    "$0":"5",
-    "$1":"254",
-    "$2":"0",
-    "$3":"6",
-    "$4":"15",
-    "$5":"15",
-    "$6":"1",
-    "$8":"0",
-    "$9":"1",
-    "$10":"511",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$14":"14",
-    "$15":"0",
-    "$16":"0",
-    "$17":"0",
-    "$18":"0",
-    "$19":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"78",
-    "$23":"3",
-    "$24":"200",
-    "$25":"3000",
-    "$26":"250",
-    "$27":"0.8",
-    "$28":"0.100",
-    "$29":"0",
-    "$30":"30000",
-    "$31":"10000",
-    "$32":"0",
-    "$33":"1000",
-    "$34":"0.0",
-    "$35":"0.0",
-    "$36":"100.0",
-    "$37":"0",
-    "$39":"1",
-    "$40":"0",
-    "$41":"1",
-    "$42":"1",
-    "$43":"1",
-    "$44":"4",
-    "$45":"3",
-    "$46":"0",
-    "$47":"0",
-    "$56":"5",
-    "$57":"100",
-    "$58":"-5",
-    "$59":"500",
-    "$60":"1",
-    "$61":"3",
-    "$62":"0",
-    "$63":"3",
-    "$64":"0",
-    "$65":"0",
-    "$70":"7",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$103":"19.75308642",
-    "$110":"5000.000",
-    "$111":"5000.000",
-    "$112":"5000.000",
-    "$113":"8000.000",
-    "$120":"1000.000",
-    "$121":"1000.000",
-    "$122":"1000.000",
-    "$123":"1000.000",
-    "$130":"816.000",
-    "$131":"864.000",
-    "$132":"122.000",
-    "$133":"0",
-    "$140":"2800",
-    "$141":"2800",
-    "$142":"2800",
-    "$143":"0",
-    "$150":"8",
-    "$151":"8",
-    "$152":"8",
-    "$153":"16",
-    "$180":"200",
-    "$181":"200",
-    "$182":"200",
-    "$183":"200",
-    "$190":"3000",
-    "$191":"3000",
-    "$192":"3000",
-    "$193":"3000",
-    "$200":"22",
-    "$201":"22",
-    "$202":"22",
-    "$203":"22",
-    "$210":"35",
-    "$211":"35",
-    "$212":"35",
-    "$213":"50",
-    "$220":"22",
-    "$221":"22",
-    "$222":"22",
-    "$223":"22",
-    "$300":"grblHAL",
-    "$301":"0",
-    "$302":"192.168.5.1",
-    "$303":"192.168.5.1",
-    "$304":"255.255.255.0",
-    "$305":"23",
-    "$307":"80",
-    "$308":"21",
-    "$338":"7",
-    "$339":"0",
-    "$340":"0",
-    "$341":"0",
-    "$342":"30.0",
-    "$343":"25.0",
-    "$344":"200.0",
-    "$345":"200.0",
-    "$346":"1",
-    "$370":"0",
-    "$372":"0",
-    "$374":"3",
-    "$375":"50",
-    "$376":"1",
-    "$384":"0",
-    "$392":"4",
-    "$393":"1",
-    "$395":"0",
-    "$398":"128",
-    "$450":"0",
-    "$451":"0",
-    "$452":"0",
-    "$453":"G4P0",
-    "$454":"G4P0",
-    "$455":"G4P0",
-    "$456":"4",
-    "$457":"4",
-    "$458":"4",
-    "$459":"4",
-    "$462":"8192",
-    "$463":"8193",
-    "$464":"8451",
-    "$465":"18",
-    "$466":"34",
-    "$467":"1",
-    "$468":"50",
-    "$469":"60",
-    "$470":"60",
-    "$471":"100",
-    "$478":"3",
-    "$481":"0",
-    "$484":"1",
-    "$486":"0",
-    "$511":"8",
-    "$512":"6",
-    "$513":"9",
-    "$520":"0",
-    "$521":"0",
-    "$522":"0",
-    "$523":"0",
-    "$650":"1",
-    "$651":"1",
-    "$652":"0",
-    "$653":"2",
-    "$654":"8",
-    "$655":"0",
-    "$656":"1",
-    "$657":"22",
-    "$658":"7",
-    "$659":"3",
-    "$660":"0",
-    "$661":"3",
-    "$662":"0",
-    "$663":"41759",
-    "$664":"0",
-    "$665":"1",
-    "$666":"0",
-    "$668":"0",
-    "$730":"255",
-    "$731":"0",
-    "$733":"1000",
-    "$734":"0",
-    "$735":"0",
-    "$736":"100",
-    "$741":"0",
-    "$742":"0",
-    "$743":"0"
-}
\ No newline at end of file
diff --git a/src/app/containers/Firmware/eepromFiles/MK1_48x30.json b/src/app/containers/Firmware/eepromFiles/MK1_48x30.json
deleted file mode 100644
index f4925d3be..000000000
--- a/src/app/containers/Firmware/eepromFiles/MK1_48x30.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "$0": "10",
-  "$1": "100",
-  "$2": "1",
-  "$3": "5",
-  "$4": "1",
-  "$5": "0",
-  "$6": "0",
-  "$10": "1",
-  "$11": "0.010",
-  "$12": "0.002",
-  "$13": "0",
-  "$20": "0",
-  "$21": "0",
-  "$22": "0",
-  "$23": "3",
-  "$24": "25.000",
-  "$25": "1500.000",
-  "$26": "250",
-  "$27": "1.000",
-  "$30": "30000",
-  "$31": "0",
-  "$32": "0",
-  "$100": "200.000",
-  "$101": "200.000",
-  "$102": "200.000",
-  "$110": "4000.000",
-  "$111": "4000.000",
-  "$112": "3000.000",
-  "$120": "750.000",
-  "$121": "750.000",
-  "$122": "500.000",
-  "$130": "1230.000",
-  "$131": "820.000",
-  "$132": "110.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/MK2_12x30.json b/src/app/containers/Firmware/eepromFiles/MK2_12x30.json
deleted file mode 100644
index f93ff6cae..000000000
--- a/src/app/containers/Firmware/eepromFiles/MK2_12x30.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"100",
-    "$2":"1",
-    "$3":"1",
-    "$4":"1",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"3",
-    "$24":"25.000",
-    "$25":"1500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"30000",
-    "$31":"10000",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"4000.000",
-    "$111":"4000.000",
-    "$112":"3000.000",
-    "$120":"750.000",
-    "$121":"750.000",
-    "$122":"500.000",
-    "$130":"810.000",
-    "$131":"355.000",
-    "$132":"120.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/MK2_30x30.json b/src/app/containers/Firmware/eepromFiles/MK2_30x30.json
deleted file mode 100644
index 217c4660a..000000000
--- a/src/app/containers/Firmware/eepromFiles/MK2_30x30.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"100",
-    "$2":"1",
-    "$3":"1",
-    "$4":"1",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"3",
-    "$24":"25.000",
-    "$25":"1500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"30000",
-    "$31":"10000",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"4000.000",
-    "$111":"4000.000",
-    "$112":"3000.000",
-    "$120":"750.000",
-    "$121":"750.000",
-    "$122":"500.000",
-    "$130":"810.000",
-    "$131":"855.000",
-    "$132":"120.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/MK2_48x30.json b/src/app/containers/Firmware/eepromFiles/MK2_48x30.json
deleted file mode 100644
index 435ae5ff8..000000000
--- a/src/app/containers/Firmware/eepromFiles/MK2_48x30.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "$0": "10",
-  "$1": "100",
-  "$2": "1",
-  "$3": "1",
-  "$4": "1",
-  "$5": "0",
-  "$6": "0",
-  "$10": "1",
-  "$11": "0.010",
-  "$12": "0.002",
-  "$13": "0",
-  "$20": "0",
-  "$21": "0",
-  "$22": "0",
-  "$23": "3",
-  "$24": "25.000",
-  "$25": "1500.000",
-  "$26": "250",
-  "$27": "1.000",
-  "$30": "30000",
-  "$31": "10000",
-  "$32": "0",
-  "$100": "200.000",
-  "$101": "200.000",
-  "$102": "200.000",
-  "$110": "4000.000",
-  "$111": "4000.000",
-  "$112": "3000.000",
-  "$120": "750.000",
-  "$121": "750.000",
-  "$122": "500.000",
-  "$130": "1270.000",
-  "$131": "855.000",
-  "$132": "120.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/Sienci Long Mill12X12.json b/src/app/containers/Firmware/eepromFiles/Sienci Long Mill12X12.json
deleted file mode 100644
index 9786e72ab..000000000
--- a/src/app/containers/Firmware/eepromFiles/Sienci Long Mill12X12.json	
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"100",
-    "$2":"1",
-    "$3":"5",
-    "$4":"1",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"0",
-    "$24":"25.000",
-    "$25":"500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"30000",
-    "$31":"0",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"4000.000",
-    "$111":"4000.000",
-    "$112":"3000.000",
-    "$120":"750.000",
-    "$121":"750.000",
-    "$122":"500.000",
-    "$130":"285.000",
-    "$131":"320.000",
-    "$132":"110.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/Sienci Long Mill12X30.json b/src/app/containers/Firmware/eepromFiles/Sienci Long Mill12X30.json
deleted file mode 100644
index 1b7791a28..000000000
--- a/src/app/containers/Firmware/eepromFiles/Sienci Long Mill12X30.json	
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"100",
-    "$2":"1",
-    "$3":"5",
-    "$4":"1",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"0",
-    "$24":"25.000",
-    "$25":"500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"30000",
-    "$31":"0",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"4000.000",
-    "$111":"4000.000",
-    "$112":"3000.000",
-    "$120":"750.000",
-    "$121":"750.000",
-    "$122":"500.000",
-    "$130":"770.000",
-    "$131":"320.000",
-    "$132":"110.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/Sienci Long Mill30X30.json b/src/app/containers/Firmware/eepromFiles/Sienci Long Mill30X30.json
deleted file mode 100644
index ed2cb6cbc..000000000
--- a/src/app/containers/Firmware/eepromFiles/Sienci Long Mill30X30.json	
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"100",
-    "$2":"1",
-    "$3":"5",
-    "$4":"1",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"3",
-    "$24":"25.000",
-    "$25":"1500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"30000",
-    "$31":"0",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"4000.000",
-    "$111":"4000.000",
-    "$112":"3000.000",
-    "$120":"750.000",
-    "$121":"750.000",
-    "$122":"500.000",
-    "$130":"770.000",
-    "$131":"820.000",
-    "$132":"110.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/Sienci Mill One.json b/src/app/containers/Firmware/eepromFiles/Sienci Mill One.json
deleted file mode 100644
index 6087b3739..000000000
--- a/src/app/containers/Firmware/eepromFiles/Sienci Mill One.json	
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"25",
-    "$2":"0",
-    "$3":"6",
-    "$4":"0",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"0",
-    "$24":"25.000",
-    "$25":"500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"1000",
-    "$31":"0",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"1800.000",
-    "$111":"1800.000",
-    "$112":"600.000",
-    "$120":"30.000",
-    "$121":"30.000",
-    "$122":"15.000",
-    "$130":"235.000",
-    "$131":"185.000",
-    "$132":"100.000"
-}
diff --git a/src/app/containers/Firmware/eepromFiles/Sienci Mill OneV3.json b/src/app/containers/Firmware/eepromFiles/Sienci Mill OneV3.json
deleted file mode 100644
index 7ea1f5ee9..000000000
--- a/src/app/containers/Firmware/eepromFiles/Sienci Mill OneV3.json	
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$0":"10",
-    "$1":"25",
-    "$2":"0",
-    "$3":"6",
-    "$4":"0",
-    "$5":"0",
-    "$6":"0",
-    "$10":"1",
-    "$11":"0.010",
-    "$12":"0.002",
-    "$13":"0",
-    "$20":"0",
-    "$21":"0",
-    "$22":"0",
-    "$23":"0",
-    "$24":"25.000",
-    "$25":"500.000",
-    "$26":"250",
-    "$27":"1.000",
-    "$30":"1000",
-    "$31":"0",
-    "$32":"0",
-    "$100":"200.000",
-    "$101":"200.000",
-    "$102":"200.000",
-    "$110":"1800.000",
-    "$111":"1800.000",
-    "$112":"600.000",
-    "$120":"30.000",
-    "$121":"30.000",
-    "$122":"15.000",
-    "$130":"257.000",
-    "$131":"185.000",
-    "$132":"100.000"
-}
diff --git a/src/server/controllers/Grbl/GrblController.js b/src/server/controllers/Grbl/GrblController.js
index 649ac3e05..b3a584c9a 100644
--- a/src/server/controllers/Grbl/GrblController.js
+++ b/src/server/controllers/Grbl/GrblController.js
@@ -83,7 +83,6 @@ import {
     ALARM,
     ERROR
 } from '../../../app/constants';
-import ApplyFirmwareProfile from '../../lib/Firmware/Profiles/ApplyFirmwareProfile';
 import { determineMachineZeroFlagSet, determineMaxMovement, getAxisMaximumLocation } from '../../lib/homing';
 import { calcOverrides } from '../runOverride';
 import { GCODE_TRANSLATION_TYPE, translateGcode } from '../../lib/gcode-translation';
@@ -1427,10 +1426,6 @@ class GrblController {
                 let [files] = args;
                 this.emit('task:finish', files);
             },
-            'firmware:applyProfileSettings': () => {
-                let [nameOfMachine, typeOfMachine, port] = args;
-                ApplyFirmwareProfile(nameOfMachine, typeOfMachine, port);
-            },
             'firmware:grabMachineProfile': () => {
                 const machineProfile = store.get('machineProfile');
                 this.emit('sender:status', machineProfile);
diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js
index 1cbd7a295..5d4461463 100644
--- a/src/server/controllers/Grblhal/GrblHalController.js
+++ b/src/server/controllers/Grblhal/GrblHalController.js
@@ -79,7 +79,6 @@ import {
     ALARM,
     ERROR
 } from '../../../app/constants';
-import ApplyFirmwareProfile from '../../lib/Firmware/Profiles/ApplyFirmwareProfile';
 import { determineHALMachineZeroFlag, determineMaxMovement, getAxisMaximumLocation } from '../../lib/homing';
 import { calcOverrides } from '../runOverride';
 import ToolChanger from '../../lib/ToolChanger';
@@ -1479,10 +1478,6 @@ class GrblHalController {
                 let [files] = args;
                 this.emit('task:finish', files);
             },
-            'firmware:applyProfileSettings': () => {
-                let [nameOfMachine, typeOfMachine, port] = args;
-                ApplyFirmwareProfile(nameOfMachine, typeOfMachine, port);
-            },
             'firmware:grabMachineProfile': () => {
                 const machineProfile = store.get('machineProfile');
                 this.emit('sender:status', machineProfile);
diff --git a/src/server/lib/Firmware/Profiles/ApplyFirmwareProfile.js b/src/server/lib/Firmware/Profiles/ApplyFirmwareProfile.js
deleted file mode 100644
index d551ca8d5..000000000
--- a/src/server/lib/Firmware/Profiles/ApplyFirmwareProfile.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2021 Sienci Labs Inc.
- *
- * This file is part of gSender.
- *
- * gSender is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, under version 3 of the License.
- *
- * gSender is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with gSender.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Contact for information regarding this program and its license
- * can be sent through gSender@sienci.com or mailed to the main office
- * of Sienci Labs Inc. in Waterloo, Ontario, Canada.
- *
- */
-
-import defaultGrbl from '../../../../app/containers/Firmware/eepromFiles/DefaultGrblSettings.json';
-import longMill12x12 from '../../../../app/containers/Firmware/eepromFiles/Sienci Long Mill12X12.json';
-import longMill12x30 from '../../../../app/containers/Firmware/eepromFiles/Sienci Long Mill12X30.json';
-import longMill30x30 from '../../../../app/containers/Firmware/eepromFiles/Sienci Long Mill30X30.json';
-import millOne from '../../../../app/containers/Firmware/eepromFiles/Sienci Mill One.json';
-import millOneV3 from '../../../../app/containers/Firmware/eepromFiles/Sienci Mill OneV3.json';
-import mK230x30 from '../../../../app/containers/Firmware/eepromFiles/MK2_30x30.json';
-import mK212x30 from '../../../../app/containers/Firmware/eepromFiles/MK2_12x30.json';
-
-import store from '../../../store';
-
-const ApplyFirmwareProfile = (nameOfMachine, typeOfMachine, recievedPortNumber) => {
-    const controller = store.get(`controllers[${recievedPortNumber}]`);
-    let settings = defaultGrbl;
-
-    if (nameOfMachine === 'Mill One') {
-        if (typeOfMachine === 'V3') {
-            settings = millOneV3;
-        } else {
-            settings = millOne;
-        }
-    }
-
-    if (nameOfMachine === 'LongMill') {
-        if (typeOfMachine === '12x12') {
-            settings = longMill12x12;
-        }
-        if (typeOfMachine === '12x30') {
-            settings = longMill12x30;
-        }
-        if (typeOfMachine === '30x30') {
-            settings = longMill30x30;
-        }
-    }
-
-    if (nameOfMachine === 'LongMill MK2') {
-        if (typeOfMachine === '12X30') {
-            settings = mK212x30;
-        }
-        if (typeOfMachine === '30x30') {
-            settings = mK230x30;
-        }
-    }
-
-    const values = Object.entries(settings).map(([key, value]) => (`${key}=${value}`));
-    values.push('$$');
-
-    controller.command('gcode', values);
-};
-
-export default ApplyFirmwareProfile;