diff --git a/src/js/control-view.js b/src/js/control-view.js
index 6eaabd3..ae58bea 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -748,7 +748,6 @@ module.exports = {
 
       if (typeof axis == "undefined") {
         api.put("home");
-        console.log('store data')
       } else if (this[axis].homingMode != "manual") {
         api.put(`home/${axis}`);
       } else {
diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py
index 4e0807a..b2d3228 100644
--- a/src/py/bbctrl/Config.py
+++ b/src/py/bbctrl/Config.py
@@ -102,7 +102,6 @@ class Config(object):
                 config_data[name] = default
             
             self.save(config_data)
-            # self.values[name] = config_data[name]
             self.log.info('105: name:{} default:{}'.format(name, default))
         except Exception: self.log.exception('Internal error: Failed to upgrade config')
 
diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py
index f66cd93..c1d6a33 100644
--- a/src/py/bbctrl/Mach.py
+++ b/src/py/bbctrl/Mach.py
@@ -313,7 +313,9 @@ class Mach(Comm):
 
             self.planner.mdi(gcode, False)
             super().resume()
-            if 'offset_' + axis in config.values:
+            if 'offset_' + axis and axis + 'p' in config.values:
+                state.set('offset_' + axis, config.values['offset_' + axis])
+                state.set(axis + 'p', 0)
                 self.log.info('Set the state value from config: {} = {}'.format('offset_' + axis , config.values['offset_' + axis]))
             else:
                 self.log.info('Values is not present in config:{}'.format('offset_' + axis))
diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py
index dbae072..b12c273 100644
--- a/src/py/bbctrl/State.py
+++ b/src/py/bbctrl/State.py
@@ -230,7 +230,7 @@ class State(object):
 
     def set(self, name, value):
         name = self.resolve(name)
-        keys = ['xp', 'yp', 'zp', 'offset_x', 'offset_y', 'offset_z']
+        keys = ['offset_x', 'offset_y', 'offset_z']
         
         if name in keys and 'cycle' in self.vars:
             self.log.info('236 cycle:{} name:{} value:{}'.format(self.vars['cycle'], name, value))
diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index eb7a4fe..535843b 100644
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -654,18 +654,6 @@
   },
 
   "axes": {
-    "xp": {
-      "type": "float",
-      "default": 0
-    },
-    "yp": {
-      "type": "float",
-      "default": 0
-    },
-    "zp": {
-      "type": "float",
-      "default": 0
-    },
     "offset_x": {
       "type": "float",
       "default": 0