diff --git a/debian/postinst b/debian/postinst
index 79892fd1..501b59db 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -14,6 +14,8 @@ sudo -u ${SUDO_USER:-$USER} mkdir -p "${TARGET_HOME}.local/usr/share/icons"
 
 # Copy the probe_basic_sims directory to the target directory
 sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/probe_basic/configs "${TARGET_HOME}linuxcnc/"
+# Copy only new subroutines to the target nc_files directory
+sudo -u ${SUDO_USER:-$USER} cp -r -n /usr/share/probe_basic/nc_files "${TARGET_HOME}linuxcnc/"
 
 # Copy the probe_basic icons directory to the target directory
 sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/icons/probe_basic_icon.png "${TARGET_HOME}.local/usr/share/icons/"
diff --git a/debian/rules b/debian/rules
index 42a5eee5..fb8a780d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,10 @@ override_dh_auto_install:
 	mkdir -p debian/python3-probe-basic/usr/share/probe_basic/configs/
 	# Install the config file contents
 	cp -r linuxcnc/configs debian/python3-probe-basic/usr/share/probe_basic/
+	# create nc_files directory if it doesn't exist
+	mkdir -p debian/python3-probe-basic/usr/share/probe_basic/nc_files/
+	# Install the nc_file file contents
+	cp -r linuxcnc/nc_files debian/python3-probe-basic/usr/share/probe_basic/
 
 
 override_dh_install:
diff --git a/docs_src/source/images/atc_carousel_connections.png b/docs_src/source/images/atc_carousel_connections.png
new file mode 100644
index 00000000..f0a81bbc
Binary files /dev/null and b/docs_src/source/images/atc_carousel_connections.png differ
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m13.ngc b/linuxcnc/configs/atc_sim/macros_sim/m13.ngc
deleted file mode 100644
index ede03334..00000000
--- a/linuxcnc/configs/atc_sim/macros_sim/m13.ngc
+++ /dev/null
@@ -1,42 +0,0 @@
-o<m13> sub
-
-; Move tool carousel CW until ATC zero
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m13>)
-
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{"REFERENCING"}])
-
-M64 P3 ; Move Motor FWD
-M66 P3 L1 Q20 ; wait for rising edge on home index
-o100 if [#5399 LT 0]
-    M65 P3 ; stop motor
-    (abort, Failed to home carousel)
-o100 endif
-
-#3990 = 1
-M65 P3 ; Stop motor
-#3989 = 1
-
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{}])
-
-#<number_of_pockets> = 12
-o110 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o110 endif
-
-#1 = 0
-
-o120 while [#1 LT #<number_of_pockets>]
-    #1 = [#1+1]
-    #2 = #[4000+#1]
-    (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#1, #2}])
-o120 endwhile
-
-M61 Q#3991 G43 H#3991 #5210 = 0
-
-(PRINT, o<m13> endsub)
-o<m13> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m21.ngc b/linuxcnc/configs/atc_sim/macros_sim/m21.ngc
deleted file mode 100644
index 2ec9daea..00000000
--- a/linuxcnc/configs/atc_sim/macros_sim/m21.ngc
+++ /dev/null
@@ -1,45 +0,0 @@
-o<m21> sub
-
-; Move Carousel to the tool change position - OUT
-; then unload any tool in the spindle into the current pocket
-; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-(PRINT, o<m21>)
-
-#<atc_z_tool_change_height> = -3.9000
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-M65 P1 ; switch off carousel in solenoid
-M66 P1 L3 Q1
-
-M5 M9
-G90
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
-
-;M19 R0 Q3 ; orient spindle
-
-M64 P0 ; Move Carousel out
-M66 P1 L3 Q5 ; check for carousel out sensor
-o100 if [#5399 LT 0]
-    M65 P0 ; switch off atc out solenoid
-    (abort, ATC not in position)
-o100 endif
-
-M24 ; activate drawbar, release the tool
-M5 ; turn off spindle lock
-
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-#3991 = 0; save fact there is now no tool in the spindle
-
-(PRINT, o<m21> endsub)
-o<m21> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/atc_sim/macros_sim/toolsetter_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim/toolsetter_wco.ngc
deleted file mode 100644
index 61207d8e..00000000
--- a/linuxcnc/configs/atc_sim/macros_sim/toolsetter_wco.ngc
+++ /dev/null
@@ -1,87 +0,0 @@
-(author: Chris Polanski)
-(version: 0.1)
-(date: 11/5/22)
-
-(Measure tool and set Z 0.000 in current WCO for new tool)
-
-o<toolsetter_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  
-  #<tool_touch_x_coords> = 33.2
-  #<tool_touch_y_coords> = 4.4
-  #<dust_boot_x_coords> = 26
-  #<dust_boot_y_coords> = 3
-  #<max_z_distance> = 2.5
-  #<tool_setter_height> = 1.8
-  #<z_clearance> = 0.2500
-  #<probe_slow_fr> = 0.0
-  #<probe_fast_fr> = 30.0
- 
-  (start with an m6, do all the standard m6 stuff and then touch off -TMC)
-  M6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  o100 if [2 EQ 2]
-  G49
-  o100 endif
-
-  G90    (set absolute coordinates)
-  G53 G0 Z0    (move to z0 home position)
-  G53 G0 X#<tool_touch_x_coords> Y#<tool_touch_y_coords>
-  
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-    (back to start point and feed)
-    G90
-    G0 Z#<z>
-    F[#<probe_fast_fr>]
-    (return from sub)
-    o<toolsetter_wco> return
-  o110 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-    (Initiate Slow Z- Probe)
-    G91
-    F[#<probe_slow_fr>]
-    G38.2 Z-[#<z_clearance> * 2]
-    #<z_minus_probed> = #5063
-    G90
-    G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o120 endif
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-  #<new_tool_wco_z> = [#<z_minus_probed> - #<tool_setter_height>]
-
-  (Record Z zero in selected WCO)
-  G10 L2 P#5220 Z[#<new_tool_wco_z> + #<workspace_z>]
-
-  (Move to Toolset location)
-  G53 G0 X#<dust_boot_x_coords> Y#<dust_boot_y_coords>
-  
-  (pause for dust boot)
-  M0 (replace the dust boot)
-
-o<toolsetter_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini b/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini
index 9640ba46..f6563c12 100644
--- a/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini
+++ b/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10
diff --git a/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini b/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini
index d6e714d8..6afa7c13 100644
--- a/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini
+++ b/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G21 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10
diff --git a/linuxcnc/configs/atc_sim/vmc_index_inch.ini b/linuxcnc/configs/atc_sim/vmc_index_inch.ini
index a58495a5..0786cc2d 100644
--- a/linuxcnc/configs/atc_sim/vmc_index_inch.ini
+++ b/linuxcnc/configs/atc_sim/vmc_index_inch.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10
diff --git a/linuxcnc/configs/atc_sim/vmc_index_metric.ini b/linuxcnc/configs/atc_sim/vmc_index_metric.ini
index 5ceb2b6a..5ad73c61 100644
--- a/linuxcnc/configs/atc_sim/vmc_index_metric.ini
+++ b/linuxcnc/configs/atc_sim/vmc_index_metric.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G21 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10
diff --git a/linuxcnc/configs/probe_basic/probe_basic.ini b/linuxcnc/configs/probe_basic/probe_basic.ini
index 4f96eabc..53fc423c 100644
--- a/linuxcnc/configs/probe_basic/probe_basic.ini
+++ b/linuxcnc/configs/probe_basic/probe_basic.ini
@@ -5,7 +5,7 @@ DEBUG = 0
 
 [DISPLAY]
 DISPLAY = probe_basic
-OPEN_FILE = ~/linuxcnc/nc_files/pb_examples/blank.ngc
+OPEN_FILE = ~/linuxcnc/nc_files/probe_basic/examples/blank.ngc
 CONFIRM_EXIT = False
 LOG_FILE = sim.log
 LOG_LEVEL = DEBUG
@@ -76,7 +76,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = sim.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = subroutines
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 
 [EMCMOT]
 EMCMOT = motmod
diff --git a/linuxcnc/configs/probe_basic/subroutines/clamptool.ngc b/linuxcnc/configs/probe_basic/subroutines/clamptool.ngc
deleted file mode 100644
index abc300bb..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/clamptool.ngc
+++ /dev/null
@@ -1,12 +0,0 @@
-o<clamptool> sub
-
-M65 P2 ; clamp the tool
-
-M66 P5 L3 Q1 ; check the clamped tool sensor
-o100 if [#5399 LT 0]
-    (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds
-o100 endif
-
-o<clamptool> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc b/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc
deleted file mode 100644
index 95828367..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc
+++ /dev/null
@@ -1,28 +0,0 @@
-o<extendatc> sub
-
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-#<atc_z_tool_change_height> = -3.9000
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-M65 P1 ; Turn off carousel home solenoid
-M64 P0 ; Move Carousel OUT
-
-M66 P1 L3 Q5 ; check for carousel out position sensor
-o100 if [#5399 LT 0]
-    M65 P0 ; switch off atc out solenoid
-    (abort, ATC not in position)
-o100 endif
-
-o<extendatc> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc
deleted file mode 100644
index 71956e07..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc
+++ /dev/null
@@ -1,10 +0,0 @@
-o<go_to_g30> sub
-
-M73
-G90
-G53 G0 Z0
-G30
-
-o<go_to_g30> endsub
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc
deleted file mode 100644
index 62d10af7..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc
+++ /dev/null
@@ -1,10 +0,0 @@
-o<go_to_home> sub
-
-M73
-G90
-G53 G0 Z0
-G53 G0 X0 Y0
-
-o<go_to_home> endsub
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc
deleted file mode 100644
index dbb91808..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc
+++ /dev/null
@@ -1,15 +0,0 @@
-o<go_to_zero> sub
-
-M73
-G90
-o100 if [#5422 LT 0]
-    G0 Z0
-    G0 X0 Y0
-o100 else if [#5422 GE 0]
-    G0 X0 Y0
-    G0 Z0
-o100 endif
-
-o<go_to_zero> endsub
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc b/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc
deleted file mode 100644
index 8b31226f..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc
+++ /dev/null
@@ -1,48 +0,0 @@
-(author: Chris P, LWK)
-(version: 0.4)
-(date: 11/11/23)
-
-(load tool in spindle safety macro)
-; This is called form the ATC page
-; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
-; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently)
-; Parameter #4000 is not populated just used in the maths to calculate the above numbers
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-
-o<load_spindle_safety> sub
-(PRINT, o<load_spindle_safety>)
-
-#<load_spindle_tool_number> = #1 ; this is the value form the ATC tab
-#<probe_tool_number> = #2
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-#10 = 0
-#11 = 0 ; 1 if tool is already stored in carousel
-
-o110 while [#10 LT #<number_of_pockets>]
-    #10 = [#10+1]
-    o120 if [#<load_spindle_tool_number> EQ #[4000 + #10]]
-        (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10)
-        #11 = 1
-    o120 endif
-o110 endwhile
-
-o130 if [#11 EQ 0]
-    M61 Q#<load_spindle_tool_number> G43 H#<load_spindle_tool_number>
-    #3991 = #<load_spindle_tool_number>
-o130 endif
-
-o140 if [#<load_spindle_tool_number> EQ #<probe_tool_number>]
-    S0 M5
-o140 endif
-
-o<program_coolant> call
-
-o<load_spindle_safety> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc b/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc
deleted file mode 100644
index 1b4f7d32..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc
+++ /dev/null
@@ -1,48 +0,0 @@
-(author: Chris P, LWK)
-(version: 0.4)
-(date: 11/11/23)
-
-(load tool in spindle safety macro)
-; This is called form the Tool page
-; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
-; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently)
-; Parameter #4000 is not populated just used in the maths to calculate the above numbers
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-
-o<load_spindle_safety_2> sub
-(PRINT, o<load_spindle_safety_2>)
-
-#<load_spindle_tool_number_2> = #1 ; this is the value form the TOOL tab
-#<probe_tool_number> = #2
-
-; default to a 12 pocket ATC (mtoolhing DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-#10 = 0
-#11 = 0 ; 1 if tool is already stored in carousel
-
-o110 while [#10 LT #<number_of_pockets>]
-    #10 = [#10+1]
-    o120 if [#<load_spindle_tool_number_2> EQ #[4000 + #10]]
-        (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10)
-        #11 = 1
-    o120 endif
-o110 endwhile
-
-o130 if [#11 EQ 0]
-    M61 Q#<load_spindle_tool_number_2> G43 H#<load_spindle_tool_number_2>
-    #3991 = #<load_spindle_tool_number_2>
-o130 endif
-
-o140 if [#<load_spindle_tool_number_2> EQ #<probe_tool_number>]
-    S0 M5
-o140 endif
-
-o<program_coolant> call
-
-o<load_spindle_safety_2> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/m10.ngc b/linuxcnc/configs/probe_basic/subroutines/m10.ngc
deleted file mode 100644
index 2562672e..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m10.ngc
+++ /dev/null
@@ -1,37 +0,0 @@
-o<m10> sub
-
-; Move tool carousel best direction to pocket P
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m10> P#<p>)
-
-o100 if [#3989 NE 1]
-    M13
-o100 endif
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-#<steps> = [#3990 - #<p>]
-(PRINT, o<m10> P#<p>, steps=#<steps>)
-o110 if [#<steps> GT [#<number_of_pockets> / 2]]
-    #<steps>=[#<steps> - #<number_of_pockets>]
-o110 endif
-o120 if [#<steps> LT -[#<number_of_pockets> / 2]]
-    #<steps>=[#<steps> + #<number_of_pockets>]
-o120 endif
-o130 if [#<steps> GT 0]
-    M12 P[#<steps>]
-o130 elseif [#<steps> LT 0]
-    #<steps>=[#<steps> * -1]
-    M11 P[#<steps>]
-o130 endif
-
-(PRINT, o<m10> endsub)
-o<m10> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m11.ngc b/linuxcnc/configs/probe_basic/subroutines/m11.ngc
deleted file mode 100644
index 3db74563..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m11.ngc
+++ /dev/null
@@ -1,50 +0,0 @@
-o<m11> sub
-
-; Move tool carousel CCW Parameter P number of steps
-; Without parameter one step CCW.
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m11> P#<p>)
-
-o100 if [#3989 NE 1]
-    (PRINT, atc not homed, homing)
-    M13
-o100 endif
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-o110 if [EXISTS[#<p>]]
-    #<steps_to_move> = #<p>
-o110 else
-    #<steps_to_move> = 1
-    (tells the atc widget move 1 step reverse)
-o110 endif
-
-(tells the atc widget how many steps to move and start moving reverse)
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#<steps_to_move>, "cw"}])
-
-M64 P4 ; Move atc motor Rev
-
-o120 do
-    M66 P4 L1 Q3 ; wait for rising edge on rotation index
-    o130 if [#5399 LT 0]
-        M65 P4 ; Stop atc motor
-        (abort, Failed to get rotation index)
-    o130 endif
-    #3990 = [[[#3990+2] MOD #<number_of_pockets>]-1] ; Pocket is no.1-#<number_of_pockets>
-    #<steps_to_move> = [#<steps_to_move>-1]
-o120 while [#<steps_to_move> GT 0]
-
-M65 P4 ; Stop motor
-
-#<_my_current_pocket> = #3990
-
-(PRINT, o<m11> endsub)
-o<m11> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m12.ngc b/linuxcnc/configs/probe_basic/subroutines/m12.ngc
deleted file mode 100644
index 34f2d6f3..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m12.ngc
+++ /dev/null
@@ -1,50 +0,0 @@
-o<m12> sub
-
-; Move tool carousel CW Parameter P number of steps
-; Without parameter one step CW.
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m12> P#<p>)
-
-o100 if [#3989 NE 1]
-    (PRINT, atc not homed, homing)
-    M13
-o100 endif
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-o110 if [EXISTS[#<p>]]
-    #<steps_to_move> = #<p>
-o110 else
-    #<steps_to_move>=1
-    (tells the atc widget move 1 step forward)
-o110 endif
-
-(tells the atc widget how many steps to move and start moving forward)
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#<steps_to_move>, "ccw"}])
-
-M64 P3 ; Move atc motor FWD
-
-o120 do
-    M66 P4 L1 Q3 ; wait for rising edge on rotation index
-    o130 if [#5399 LT 0]
-        M65 P3 ; Stop atc motor
-        (abort, Failed to get rotation index)
-    o130 endif
-    #3990 = [[[#3990-2] MOD #<number_of_pockets>]+1] ; Pocket is no.1-#<number_of_pockets>
-    #<steps_to_move> = [#<steps_to_move>-1]
-o120 while [#<steps_to_move> GT 0]
-
-M65 P3 ; Stop motor
-
-#<_my_current_pocket> = #3990
-
-(PRINT, o<m12> endsub)
-o<m12> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m13.ngc b/linuxcnc/configs/probe_basic/subroutines/m13.ngc
deleted file mode 100644
index ede03334..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m13.ngc
+++ /dev/null
@@ -1,42 +0,0 @@
-o<m13> sub
-
-; Move tool carousel CW until ATC zero
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m13>)
-
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{"REFERENCING"}])
-
-M64 P3 ; Move Motor FWD
-M66 P3 L1 Q20 ; wait for rising edge on home index
-o100 if [#5399 LT 0]
-    M65 P3 ; stop motor
-    (abort, Failed to home carousel)
-o100 endif
-
-#3990 = 1
-M65 P3 ; Stop motor
-#3989 = 1
-
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{}])
-
-#<number_of_pockets> = 12
-o110 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o110 endif
-
-#1 = 0
-
-o120 while [#1 LT #<number_of_pockets>]
-    #1 = [#1+1]
-    #2 = #[4000+#1]
-    (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#1, #2}])
-o120 endwhile
-
-M61 Q#3991 G43 H#3991 #5210 = 0
-
-(PRINT, o<m13> endsub)
-o<m13> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m21.ngc b/linuxcnc/configs/probe_basic/subroutines/m21.ngc
deleted file mode 100644
index 72481562..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m21.ngc
+++ /dev/null
@@ -1,45 +0,0 @@
-o<m21> sub
-
-; Move Carousel to the tool change position - OUT
-; then unload any tool in the spindle into the current pocket
-; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-(PRINT, o<m21>)
-
-#<atc_z_tool_change_height> = -3.1900
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-M65 P1 ; switch off carousel in solenoid
-M66 P1 L3 Q1
-
-M5 M9
-G90
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
-
-;M19 R0 Q3 ; orient spindle
-
-M64 P0 ; Move Carousel out
-M66 P1 L3 Q5 ; check for carousel out sensor
-o100 if [#5399 LT 0]
-    M65 P0 ; switch off atc out solenoid
-    (abort, ATC not in position)
-o100 endif
-
-M24 ; activate drawbar, release the tool
-M5 ; turn off spindle lock
-
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-#3991 = 0; save fact there is now no tool in the spindle
-
-(PRINT, o<m21> endsub)
-o<m21> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m22.ngc b/linuxcnc/configs/probe_basic/subroutines/m22.ngc
deleted file mode 100644
index 2de79912..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m22.ngc
+++ /dev/null
@@ -1,42 +0,0 @@
-o<m22> sub
-
-; Move Carousel to the home position - IN
-; after loading any tool in the current pocket to the spindle
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-(PRINT, o<m22>)
-
-#<atc_z_tool_change_height> = -3.1900
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-;M19 R0 Q2
-M24
-;M19 R0 Q1
-;G90
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
-M65 P2 ; release the drawbar to clamp the tool
-M5
-M66 P5 L3 Q1 ; check the tool clamped sensor
-o100 if [#5399 LT 0]
-    (abort, Failed to reclamp tool)
-o100 endif
-
-M65 P0 ; Move Carousel home
-M66 P0 L3 Q4 ; check carousel in position sensor
-o110 if [#5399 LT 0]
-    M65 P1 ; turn off the solenoid to send atc home
-    (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds
-o110 endif
-
-;M65 P1
-
-(PRINT, o<m22> endsub)
-o<m22> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m23.ngc b/linuxcnc/configs/probe_basic/subroutines/m23.ngc
deleted file mode 100644
index e69de29b..00000000
diff --git a/linuxcnc/configs/probe_basic/subroutines/m24.ngc b/linuxcnc/configs/probe_basic/subroutines/m24.ngc
deleted file mode 100644
index 37454968..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m24.ngc
+++ /dev/null
@@ -1,14 +0,0 @@
-o<m24> sub
-(PRINT, o<m24>)
-
-M64 P2 ; unclamp the tool
-M66 P2 L3 Q2 ; check the unclamped tool sensor
-o100 if [#5399 LT 0]
-    M65 P2 ; turn off the drawbar
-    (abort, failed to release tool) ; abort if the sensor does not activate in 3 seconds
-o100 endif
-
-(PRINT, o<m24> endsub)
-o<m24> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m25.ngc b/linuxcnc/configs/probe_basic/subroutines/m25.ngc
deleted file mode 100644
index a1a7ac98..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m25.ngc
+++ /dev/null
@@ -1,15 +0,0 @@
-o<m25> sub
-(PRINT, o<m25>)
-
-M64 P0 ; Move Carousel out
-
-M66 P1 L3 Q5 ; check for carousel out sensor
-o100 if [#5399 LT 0]
-    M65 P0 ; switch off atc out solenoid
-    (abort, ATC not in position)
-o100 endif
-
-(PRINT, o<m25> endsub)
-o<m25> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/m26.ngc b/linuxcnc/configs/probe_basic/subroutines/m26.ngc
deleted file mode 100644
index e69de29b..00000000
diff --git a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc b/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc
deleted file mode 100644
index b39d506a..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc
+++ /dev/null
@@ -1,25 +0,0 @@
-(author: Chris P)
-(version: 0.2)
-(date: 07/18/22)
-
-(m6 tool call with g43 offset applied)
-
-o<m6_tool_call_atc_page> sub
-
-#<tool_number_entry_atc_page> = #1
-#<probe_tool_number> = #2
-
-T#<tool_number_entry_atc_page> M6
-o100 if [1 EQ 1]
-    G43 H#<tool_number_entry_atc_page>
-o100 endif
-
-o110 if [#<tool_number_entry_atc_page> EQ #<probe_tool_number>]
-  S0 M5
-o110 endif
-
-o<program_coolant> call
-
-o<m6_tool_call_atc_page> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc b/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc
deleted file mode 100644
index 7009b7eb..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc
+++ /dev/null
@@ -1,26 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 07/22/22)
-
-(m6 tool call with g43 offset applied)
-
-o<m6_tool_call_main_panel> sub
-
-#<tool_number_entry_main_panel> = #1
-#<probe_tool_number> = #2
-
-T#<tool_number_entry_main_panel> M6
-
-o100 if [1 EQ 1]
-    G43 H#<tool_number_entry_main_panel>
-o100 endif
-
-o110 if [#<tool_number_entry_main_panel> EQ #<probe_tool_number>]
-  S0 M5
-o110 endif
-
-o<program_coolant> call
-
-o<m6_tool_call_main_panel> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc b/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc
deleted file mode 100644
index e17b41f7..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc
+++ /dev/null
@@ -1,34 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 07/18/22)
-
-(m6 tool call with g43 offset applied)
-
-o<m6_tool_call_tool_page> sub
-
-#<tool_number_entry_tool_page> = #1
-#<probe_tool_number> = #2
-
-T#<tool_number_entry_tool_page> M6
-
-o100 if [1 EQ 1]
-    G43 H#<tool_number_entry_tool_page>
-o100 endif
-
-o110 if [#<tool_number_entry_tool_page> EQ #<probe_tool_number>]
-  S0 M5
-o110 endif
-
-#<pc_tool_length> = #5403
-
-(run program_coolant sub if selected to be active in settings page with value 1)
-o120 if [#<activate_programmable_coolant> EQ 1]
-    (run program_coolant.ngc)
-    o<program_coolant> call [#<horizontal_spindle_nozzle_dist>][#<vertical_spindle_nozzle_dist>][#<pc_angle_offset>][#<pc_tool_length>]
-o120 else
-    o<m6_tool_call_tool_page> return
-o120 endif
-
-o<m6_tool_call_tool_page> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc b/linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc
deleted file mode 100644
index 5c2fd1cd..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc
+++ /dev/null
@@ -1,19 +0,0 @@
-o<move_head_above_carousel> sub
-
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-#<atc_z_tool_change_height> = -3.1900
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-o<move_head_above_carousel> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc b/linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc
deleted file mode 100644
index c07eb35b..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc
+++ /dev/null
@@ -1,18 +0,0 @@
-o<move_tool_to_carousel_height> sub
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-#<atc_z_tool_change_height> = -3.1900
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
-
-o<move_tool_to_carousel_height> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/on_abort.ngc b/linuxcnc/configs/probe_basic/subroutines/on_abort.ngc
deleted file mode 100644
index da9f6901..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/on_abort.ngc
+++ /dev/null
@@ -1,9 +0,0 @@
-%
-o<on_abort> sub
-
-G90
-G40
-G49
-
-o<on_abort> endsub
-%
diff --git a/linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc b/linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc
deleted file mode 100644
index 1776e944..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc
+++ /dev/null
@@ -1,11 +0,0 @@
-o<orientspindle> sub
-; Orient the spindle with platter
-(PRINT, o<orientspindle>)
-
-M5 M9 ; stop all spindle motion and coolant
-M19 R0 Q4 ; orient spindle
-M5 ; turn off spindle lock
-
-o<orientspindle> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc
deleted file mode 100644
index efb82dcd..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe back left inside corner for x,y,z 0,0,0 position)
-(Start probe position is over back left inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_left_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-  (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-   o<probe_back_left_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_minus_sub" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (MSG, Missing X Sub returned edge parameter, aborting)
-    o<probe_back_left_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (MSG, Missing Y Sub returned edge parameter, aborting)
-    o<probe_back_left_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-    (Record Zero in selected axes and WCO)
-    G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-    G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-    o<probe_rect_pocket> return
-  o130 endif
-
-o<probe_back_left_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc
deleted file mode 100644
index 305b1302..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc
+++ /dev/null
@@ -1,114 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe back left top corner for x,y,z 0,0,0 position)
-(Start probe position is over back left corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_left_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_back_left_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_back_left_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_left_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_back_left_top_corner> return
-  o130 endif
-
-o<probe_back_left_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc
deleted file mode 100644
index 6cbe538c..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe back right inside corner for x,y,z 0,0,0 position)
-(Start probe position is over back right inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_right_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_back_right_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width X and Y)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_back_right_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_right_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_back_right_inside_corner> return
-  o130 endif
-
-o<probe_back_right_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc
deleted file mode 100644
index fd30605d..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc
+++ /dev/null
@@ -1,113 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/23/19)
-
-(Probe back right top corner for x,y,z 0,0,0 position)
-(Start probe position is over back right corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_right_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_back_right_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_back_right_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  (Probe Y Positioning Move)
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_right_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_back_right_top_corner> return
-  o130 endif
-
-o<probe_back_right_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc
deleted file mode 100644
index 46e705be..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe back top side for y,z 0,0 position)
-(Start probe position is over back edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_back_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_back_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_back_top_side> return
-  o120 endif
-
-o<Probe_back_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc
deleted file mode 100644
index 866e8ef1..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc
+++ /dev/null
@@ -1,8 +0,0 @@
-o<probe_cal_reset> sub
-
-  #1000 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-
-o<probe_cal_reset> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc
deleted file mode 100644
index e9dcbd00..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc
+++ /dev/null
@@ -1,325 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined diam round boss)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_cal_round_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<cal_diameter> = #16        (=1.0000)
-  #<sq_cal_axis> = #17         (=0)
-  #<max_vel_slider> = #18      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_cal_round_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Move to z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Move to Y Center)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 X[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  o110 if [#<x_minus_probed> GT #<x_plus_probed>]
-    #<x_raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-  o110 else
-      #<x_raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-  o110 endif
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<x_raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 Y[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  o120 if [#<y_minus_probed> GT #<y_plus_probed>]
-      #<y_raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-  o120 else
-      #<y_raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-      o<probe_round_boss> return
-  o120 endif
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<y_raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  o130 if [#<cal_diameter> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<cal_diameter> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o130 else
-      #<x_cal_error> = [[#<x_probed_width> - #<cal_diameter>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o130 endif
-
-  o140 if [#<cal_diameter> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<cal_diameter> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o140 else
-      #<y_cal_error> = [[#<y_probed_width> - #<cal_diameter>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o140 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o150 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o150 else if [#<sq_cal_axis> EQ 1]
-    #1000 = [ABS[#<new_x_cal_offset>]]
-    (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o150 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o150 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o160 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      o<probe_cal_round_boss> return
-  o160 endif
-
-o<probe_cal_round_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc
deleted file mode 100644
index fb372418..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc
+++ /dev/null
@@ -1,218 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined diam round pocket)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_cal_round_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<cal_diameter> = #16        (=1.0000)
-  #<sq_cal_axis> = #17         (=0)
-  #<max_vel_slider> = #18      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-       o<probe_cal_round_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed diameter calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  o110 if [#<cal_diameter> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<cal_diameter> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 else
-      #<x_cal_error> = [[#<x_probed_width> - #<cal_diameter>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 endif
-
-  o120 if [#<cal_diameter> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<cal_diameter> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 else
-      #<y_cal_error> = [[#<y_probed_width> - #<cal_diameter>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o130 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else if [#<sq_cal_axis> EQ 1]
-      #1000 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o140 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_cal_round_pocket> return
-  o140 endif
-
-o<probe_cal_round_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc
deleted file mode 100644
index 60c51131..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc
+++ /dev/null
@@ -1,220 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined width square boss)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_cal_square_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<x_cal_width> = #16         (=0)
-  #<y_cal_width> = #17         (=0)
-  #<sq_cal_axis> = #18         (=0)
-  #<max_vel_slider> = #19      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_cal_square_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<x_cal_width>/2 + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_cal_width> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<y_cal_width>/2 + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_cal_width> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  o110 if [#<x_cal_width> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<x_cal_width> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 else
-      #<x_cal_error> = [[#<x_probed_width> - #<x_cal_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 endif
-
-  o120 if [#<y_cal_width> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<y_cal_width> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 else
-      #<y_cal_error> = [[#<y_probed_width> - #<y_cal_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o130 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else if [#<sq_cal_axis> EQ 1]
-      #1000 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o140 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_cal_square_boss> return
-  o140 endif
-
-o<probe_cal_square_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc
deleted file mode 100644
index d6834bc5..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc
+++ /dev/null
@@ -1,172 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined width square pocket)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_cal_square_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<x_cal_width> = #16         (=1.0000)
-  #<y_cal_width> = #17         (=1.0000)
-  #<sq_cal_axis> = #18         (=0)
-  #<max_vel_slider> = #19      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_cal_square_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  o110 if [#<x_cal_width> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<x_cal_width> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 else
-      #<x_cal_error> = [[#<x_probed_width> - #<x_cal_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 endif
-
-  o120 if [#<y_cal_width> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<y_cal_width> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 else
-      #<y_cal_error> = [[#<y_probed_width> - #<y_cal_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o130 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else if [#<sq_cal_axis> EQ 1]
-      #1000 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o140 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      o<probe_cal_square_pocket> return
-  o140 endif
-
-o<probe_cal_square_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc
deleted file mode 100644
index fbc334f5..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc
+++ /dev/null
@@ -1,165 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/7/19)
-
-(Probe Corner X minus Edge Angle for x,y,z 0,0,0 position)
-(Start probe position is over front right corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_corner_x_minus_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-    (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-     o<probe_corner_x_minus_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<z1x> = #5420
-
-  #<z1y> = #5421
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 y-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p1x> = #5420
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p1y> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_corner_x_minus_edge_angle> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p2y> = #5421
-
-  (Call sub "probe_x_minus" to Probe X- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p2x> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_corner_x_minus_edge_angle> return
-  o120 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 Y[#<edge_width>]
-
-  #<p3y> = #5421
-
-  (Call sub "probe_x_minus" to Probe X- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p3x> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_corner_x_minus_edge_angle> return
-  o130 endif
-
-  #<edge_delta> = [#<p2x> - #<p3x>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  #<c1xr> = [#<z1x> + [#<p2x> - #<z1x>] * COS[-#<edge_angle>] - [#<p2y> - #<z1y>] * SIN[-#<edge_angle>]]
-
-  #<c1yr> = [#<z1y> + [#<p1x> - #<z1x>] * SIN[-#<edge_angle>] + [#<p1y> - #<z1y>] * COS[-#<edge_angle>]]
-
-  #<c1x> = [#<z1x> + [#<c1xr> - #<z1x>] * COS[#<edge_angle>] - [#<c1yr> - #<z1y>] * SIN[#<edge_angle>]]
-
-  #<c1y> = [#<z1y> + [#<c1xr> - #<z1x>] * SIN[#<edge_angle>] + [#<c1yr> - #<z1y>] * COS[#<edge_angle>]]
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<c1x>] Y[#<c1y>]
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>]
-      o<probe_corner_x_minus_edge_angle> return
-  o140 endif
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o150 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>] R[#<edge_angle>]
-      o<probe_corner_x_minus_edge_angle> return
-  o150 endif
-
-o<probe_corner_x_minus_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc
deleted file mode 100644
index ee33cacc..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc
+++ /dev/null
@@ -1,165 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/7/19)
-
-(Probe Corner X plus Edge Angle for x,y,z 0,0,0 position)
-(Start probe position is over back left corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_corner_x_plus_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-     (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-     o<probe_corner_x_plus_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<z1x> = #5420
-
-  #<z1y> = #5421
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 y[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p1x> = #5420
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p1y> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_corner_x_plus_edge_angle> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p2y> = #5421
-
-  (Call sub "probe_x_plus" to Probe X+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p2x> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_corner_x_plus_edge_angle> return
-  o120 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 Y-[#<edge_width>]
-
-  #<p3y> = #5421
-
-  (Call sub "probe_x_plus" to Probe X+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p3x> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_corner_x_plus_edge_angle> return
-  o130 endif
-
-  #<edge_delta> = [#<p3x> - #<p2x>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  #<c1xr> = [#<z1x> + [#<p2x> - #<z1x>] * COS[-#<edge_angle>] - [#<p2y> - #<z1y>] * SIN[-#<edge_angle>]]
-
-  #<c1yr> = [#<z1y> + [#<p1x> - #<z1x>] * SIN[-#<edge_angle>] + [#<p1y> - #<z1y>] * COS[-#<edge_angle>]]
-
-  #<c1x> = [#<z1x> + [#<c1xr> - #<z1x>] * COS[#<edge_angle>] - [#<c1yr> - #<z1y>] * SIN[#<edge_angle>]]
-
-  #<c1y> = [#<z1y> + [#<c1xr> - #<z1x>] * SIN[#<edge_angle>] + [#<c1yr> - #<z1y>] * COS[#<edge_angle>]]
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<c1x>] Y[#<c1y>]
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>]
-      o<probe_corner_x_plus_edge_angle> return
-  o140 endif
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o150 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>] R[#<edge_angle>]
-      o<probe_corner_x_plus_edge_angle> return
-  o150 endif
-
-o<probe_corner_x_plus_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc
deleted file mode 100644
index 74d08f26..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc
+++ /dev/null
@@ -1,165 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/7/19)
-
-(Probe Corner Y minus Edge Angle for x,y,z 0,0,0 position)
-(Start probe position is over back right corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_corner_y_minus_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-    (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-     o<probe_corner_y_minus_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<z1x> = #5420
-
-  #<z1y> = #5421
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p1y> = #5421
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p1x> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_corner_y_minus_edge_angle> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p2x> = #5420
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p2y> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_corner_y_minus_edge_angle> return
-  o120 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 X-[#<edge_width>]
-
-  #<p3x> = #5420
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p3y> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_corner_y_minus_edge_angle> return
-  o130 endif
-
-  #<edge_delta> = [#<p2y> - #<p3y>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  #<c1xr> = [#<z1x> + [#<p1x> - #<z1x>] * COS[-#<edge_angle>] - [#<p1y> - #<z1y>] * SIN[-#<edge_angle>]]
-
-  #<c1yr> = [#<z1y> + [#<p2x> - #<z1x>] * SIN[-#<edge_angle>] + [#<p2y> - #<z1y>] * COS[-#<edge_angle>]]
-
-  #<c1x> = [#<z1x> + [#<c1xr> - #<z1x>] * COS[#<edge_angle>] - [#<c1yr> - #<z1y>] * SIN[#<edge_angle>]]
-
-  #<c1y> = [#<z1y> + [#<c1xr> - #<z1x>] * SIN[#<edge_angle>] + [#<c1yr> - #<z1y>] * COS[#<edge_angle>]]
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<c1x>] Y[#<c1y>]
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>]
-      o<probe_corner_y_minus_edge_angle> return
-  o140 endif
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o150 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>] R[#<edge_angle>]
-      o<probe_corner_y_minus_edge_angle> return
-  o150 endif
-
-o<probe_corner_y_minus_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc
deleted file mode 100644
index ff0c05a9..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc
+++ /dev/null
@@ -1,165 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/7/19)
-
-(Probe Corner Y Plus Edge Angle for x,y,z 0,0,0 position)
-(Start probe position is over front left corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_corner_y_plus_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_corner_y_plus_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<z1x> = #5420
-
-  #<z1y> = #5421
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p1y> = #5421
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p1x> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_corner_y_plus_edge_angle> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  #<p2x> = #5420
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p2y> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_corner_y_plus_edge_angle> return
-  o120 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 X[#<edge_width>]
-
-  #<p3x> = #5420
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<p3y> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_corner_y_plus_edge_angle> return
-  o130 endif
-
-  #<edge_delta> = [#<p3y> - #<p2y>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  #<c1xr> = [#<z1x> + [#<p1x> - #<z1x>] * COS[-#<edge_angle>] - [#<p1y> - #<z1y>] * SIN[-#<edge_angle>]]
-
-  #<c1yr> = [#<z1y> + [#<p2x> - #<z1x>] * SIN[-#<edge_angle>] + [#<p2y> - #<z1y>] * COS[-#<edge_angle>]]
-
-  #<c1x> = [#<z1x> + [#<c1xr> - #<z1x>] * COS[#<edge_angle>] - [#<c1yr> - #<z1y>] * SIN[#<edge_angle>]]
-
-  #<c1y> = [#<z1y> + [#<c1xr> - #<z1x>] * SIN[#<edge_angle>] + [#<c1yr> - #<z1y>] * COS[#<edge_angle>]]
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<c1x>] Y[#<c1y>]
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>]
-      o<probe_corner_y_plus_edge_angle> return
-  o140 endif
-
-  (probe mode rules for WCO,Rotation and probe position measuring only)
-  o150 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<c1x> + #<workspace_x>] Y[#<c1y> + #<workspace_y>] R[#<edge_angle>]
-      o<probe_corner_y_plus_edge_angle> return
-  o150 endif
-
-o<probe_corner_y_plus_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc
deleted file mode 100644
index a1b02431..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe front left inside corner for x,y,z 0,0,0 position)
-(Start probe position is over front left inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_left_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-    (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-    o<probe_front_left_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_left_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_left_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_front_left_inside_corner> return
-  o130 endif
-
-o<probe_front_left_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc
deleted file mode 100644
index b523777b..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc
+++ /dev/null
@@ -1,114 +0,0 @@
-(author: Chris P)
-(version: 0.4)
-(date: 04/25/19)
-
-(Probe front left top corner for x,y,z 0,0,0 position)
-(Start probe position is over front left corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_left_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-    (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-     o<probe_front_left_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_left_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_left_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_front_left_top_corner> return
-  o130 endif
-
-o<probe_front_left_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc
deleted file mode 100644
index bfda031b..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/23/19)
-
-(Probe front right inside corner for x,y,z 0,0,0 position)
-(Start probe position is over front right inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_right_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_front_right_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width X and Y)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
- (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_right_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_right_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_front_right_inside_corner> return
-  o130 endif
-
-o<probe_front_right_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc
deleted file mode 100644
index 875808cf..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc
+++ /dev/null
@@ -1,115 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/23/19)
-
-(Probe front right top corner for x,y,z 0,0,0 position)
-(Start probe position is over front right corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_right_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_front_right_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_right_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece Top at Z Clearance Height plane)
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y- side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_right_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_front_right_top_corner> return
-  o130 endif
-
-o<probe_front_right_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc
deleted file mode 100644
index cb444882..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.4)
-(date: 04/25/19)
-
-(Probe front top side for y,z 0,0 position)
-(Start probe position is over front edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_front_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-    (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_front_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_front_top_side> return
-  o120 endif
-
-o<Probe_front_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc
deleted file mode 100644
index 7913a715..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe left top side for x,z 0,0 position)
-(Start probe position is over left side edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_left_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_left_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  #<max_vel_slider> = #16      (=50) Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_left_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      o<probe_left_top_side> return
-  o120 endif
-
-o<Probe_left_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc
deleted file mode 100644
index bb60abc7..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc
+++ /dev/null
@@ -1,182 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/27/19)
-
-(Probe Boss in X and Y Axes, find center and z 0 position)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_rect_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint_0> = #11            (=1.0000)
-  #<y_hint_0> = #12            (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_rect_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<x_hint_0>/2] + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_hint_0> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<y_hint_0>/2] + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_hint_0> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>] Y[#<y_center_probed> + #<workspace_y>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_rect_boss> return
-  o110 endif
-
-o<probe_rect_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc
deleted file mode 100644
index 12ef0e40..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc
+++ /dev/null
@@ -1,134 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/26/19)
-
-(Probe rect pocket center measure x and widths, find xy center position)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_rect_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint_0> = #11            (=1.0000)
-  #<y_hint_0> = #12            (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_rect_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>] Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_rect_pocket> return
-  o110 endif
-
-o<probe_rect_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc
deleted file mode 100644
index 4a87bda7..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc
+++ /dev/null
@@ -1,116 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 01/16/23)
-
-(Probe rect pocket center measure x and y widths, find xy center position)
-(Start probe position is rough center of pocket probe tip below top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_rect_pocket_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint_0> = #11            (=1.0000)
-  #<y_hint_0> = #12            (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_rect_pocket_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3 + #11 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to X Zero, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X and Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>] Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_rect_pocket_center_start> return
-  o110 endif
-
-o<probe_rect_pocket_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc
deleted file mode 100644
index 3372002a..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc
+++ /dev/null
@@ -1,124 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe Ridge in X Axis to find center and z 0 position)
-(Start probe position is over center of stock in the X axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_ridge_x> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=100)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_ridge_x> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<x_hint>/2] + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_hint> + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      o<probe_ridge_x> return
-  o110 endif
-
-o<probe_ridge_x> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc
deleted file mode 100644
index dfb0518a..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc
+++ /dev/null
@@ -1,125 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/24/19)
-
-(Probe Ridge in Y Axis to find center and z 0 position)
-(Start probe position is over center of stock in the Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_ridge_y> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_ridge_y> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<y_hint>/2] + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  #<max_vel_slider> = #16      (=50) Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_hint> + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  #<max_vel_slider> = #16      (=50) Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_ridge_y> return
-  o110 endif
-
-o<probe_ridge_y> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc
deleted file mode 100644
index 3902c324..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe right top side for x,z 0,0 position)
-(Start probe position is over right side edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_right_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_right_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_right_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      o<probe_right_top_side> return
-  o120 endif
-
-o<Probe_right_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc
deleted file mode 100644
index 2b9a5b63..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc
+++ /dev/null
@@ -1,292 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/27/19)
-
-(Probe Boss in X and Y Axes, find center, Diam and z 0 position)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_round_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<diameter_hint> = #11       (=1.0000)
-  #<diameter_hint> = #12       (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_round_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Move to z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Move to Y Center)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 X[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  o110 if [#<x_minus_probed> GT #<x_plus_probed>]
-      #<x_raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-  o110 else
-      #<x_raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-  o110 endif
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<x_raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 Y[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  o120 if [#<y_minus_probed> GT #<y_plus_probed>]
-      #<y_raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-  o120 else
-      #<y_raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-  o120 endif
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<y_raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      o<probe_cal_round_boss> return
-  o130 endif
-
-o<probe_round_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc
deleted file mode 100644
index 24c4ac0f..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc
+++ /dev/null
@@ -1,182 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/26/19)
-
-(Probe round pocket center measure x and y Diam, find xy center position)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_round_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_round_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed diameter calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_round_pocket> return
-  o110 endif
-
-o<probe_round_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc
deleted file mode 100644
index 1a4087aa..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc
+++ /dev/null
@@ -1,164 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/26/19)
-
-(Probe round pocket center start measure x and y Diam, find xy center position)
-(Start probe position is rough center of pocket a safe distance below top edge)
-(no z move will be initiated in this routine. end position is hole center)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_round_pocket_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_round_pocket_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 +#13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed diameter calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_round_pocket_center_start> return
-  o110 endif
-
-o<probe_round_pocket_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc
deleted file mode 100644
index 2b956840..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc
+++ /dev/null
@@ -1,124 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe back top edge angle for y,z 0,0 position and edge angle)
-(Start probe position is over back edge of stock, set edge width,)
-(step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_top_back_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_top_back_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<x_start_position> = #5420
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge_start> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_top_back_edge_angle> return
-  o110 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 X-[#<edge_width>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge_end> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_top_back_edge_angle> return
-  o120 endif
-
-  #<edge_delta> = [#<y_minus_zero_edge_start> - #<y_minus_zero_edge_end>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start_position>] Y[#<y_minus_zero_edge_start>]
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o130 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_start_position>] Y[#<y_minus_zero_edge_start> + #<workspace_y>]
-      o<probe_top_back_edge_angle> return
-  o130 endif
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_start_position>] Y[#<y_minus_zero_edge_start> + #<workspace_y>] R[#<edge_angle>]
-      o<probe_top_back_edge_angle> return
-  o140 endif
-
-o<probe_top_back_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc
deleted file mode 100644
index 38dffe0f..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc
+++ /dev/null
@@ -1,124 +0,0 @@
-(author: Chris P)
-(version: 0.4)
-(date: 04/25/19)
-
-(Probe top front edge angle for y,z 0,0 position and edge angle)
-(Start probe position is over front edge of stock, set edge width,)
-(step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_top_front_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-    (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_top_front_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<x_start_position> = #5420
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge_start> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_top_front_edge_angle> return
-  o110 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 X[#<edge_width>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge_end> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_top_front_edge_angle> return
-  o120 endif
-
-  #<edge_delta> = [#<y_plus_zero_edge_end> - #<y_plus_zero_edge_start>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start_position>] Y[#<y_plus_zero_edge_start>]
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o130 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_start_position>] Y[#<y_plus_zero_edge_start> + #<workspace_y>]
-      o<probe_top_front_edge_angle> return
-  o130 endif
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_start_position>] Y[#<y_plus_zero_edge_start> + #<workspace_y>] R[#<edge_angle>]
-      o<probe_top_front_edge_angle> return
-  o140 endif
-
-o<probe_top_front_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc
deleted file mode 100644
index 8f204c9c..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc
+++ /dev/null
@@ -1,124 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe top left edge angle for y,z 0,0 position and edge angle)
-(Start probe position is over left edge of stock, set edge width,)
-(step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_top_left_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_top_left_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<y_start_position> = #5421
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge_start> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (MSG, Missing X Sub returned edge parameter, aborting)
-    o<probe_top_left_edge_angle> return
-  o110 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 Y-[#<edge_width>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge_end> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_top_left_edge_angle> return
-  o120 endif
-
-  #<edge_delta> = [#<x_plus_zero_edge_end> - #<x_plus_zero_edge_start>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge_start>] Y[#<y_start_position>]
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o130 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge_start> + #<workspace_x>] Y[#<y_start_position>]
-      o<probe_top_left_edge_angle> return
-  o130 endif
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge_start> + #<workspace_x>] Y[#<y_start_position>] R[#<edge_angle>]
-      o<probe_top_left_edge_angle> return
-  o140 endif
-
-o<probe_top_left_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc
deleted file mode 100644
index 4ebbb38c..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc
+++ /dev/null
@@ -1,124 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe top right edge angle for y,z 0,0 position and edge angle)
-(Start probe position is over right edge of stock, set edge width,)
-(step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_top_right_edge_angle> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<wco_rotation> = #16        (=0)
-  #<max_vel_slider> = #17      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-     (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-     o<probe_top_right_edge_angle> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  #<y_start_position> = #5421
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge_start> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_top_right_edge_angle> return
-  o110 endif
-
-  (edge width move to edge second probing point)
-  G91
-  F[#<probe_fast_fr>]
-  G38.3 Y[#<edge_width>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge_end> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_top_right_edge_angle> return
-  o120 endif
-
-  #<edge_delta> = [#<x_minus_zero_edge_start> - #<x_minus_zero_edge_end>]
-
-  #<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
-
-  #1011 = #<edge_delta>
-  (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-  #1012 = #<edge_angle>
-  (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge_start>] Y[#<y_start_position>]
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o130 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge_start> + #<workspace_x>] Y[#<y_start_position>]
-      o<probe_top_right_edge_angle> return
-  o130 endif
-
-  (probe mode rules for WCO, Rotation and probe position measuring only)
-  o140 if [#<probe_mode> EQ 0 AND #<wco_rotation> EQ 1]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge_start> + #<workspace_x>] Y[#<y_start_position>] R[#<edge_angle>]
-      o<probe_top_right_edge_angle> return
-  o140 endif
-
-o<probe_top_right_edge_angle> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc
deleted file mode 100644
index 3976664a..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc
+++ /dev/null
@@ -1,105 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe valley in x, find Z0, X0 valley center position)
-(Start probe position is over left side edge of valley wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_x> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_x> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      o<probe_valley_x> return
-  o110 endif
-
-
-o<probe_valley_x> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc
deleted file mode 100644
index ede6ab52..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc
+++ /dev/null
@@ -1,86 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 01/16/23)
-
-(Probe valley in x, find X zero valley center position)
-(Start probe position is centered between valley walls)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_x_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_x_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3 + #11 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      o<probe_valley_x_center_start> return
-  o110 endif
-
-o<probe_valley_x_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc
deleted file mode 100644
index 50f8e37f..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe valley in Y, find Z0, Y0 valley center position)
-(Start probe position is over back side edge of valley wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_y> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_y> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<step_off_width>]
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_valley_y> return
-  o110 endif
-
-o<probe_valley_y> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc
deleted file mode 100644
index 3d5b2b12..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc
+++ /dev/null
@@ -1,86 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 01/16/23)
-
-(Probe valley in Y find Y0 valley center position)
-(Start probe position is rough center between valley walls)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_y_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_y_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_valley_y_center_start> return
-  o110 endif
-
-o<probe_valley_y_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc
deleted file mode 100644
index ebd5a6cd..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X Minus direction and set X 0 in current WCO)
-(Start probe position to the right side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_minus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_minus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X-[#<max_xy_distance>]
-  #<x_minus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_minus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X-[#<xy_clearance> * 2]
-      #<x_minus_probed> = #5061
-      G90
-      G0 X[#<x_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<x_minus_zero_edge> = [#<x_minus_probed> - #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_minus_probed_position> = #<x_minus_zero_edge>
-
-  (output to gui DRO "X PROBED POSITION")
-  #1005 = #<x_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-o<probe_x_minus> endsub [#<x_minus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc
deleted file mode 100644
index 5bcbb495..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X Minus direction and set X 0 in current WCO)
-(Start probe position to the right side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_minus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_minus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X-[#<max_xy_distance>]
-  #<x_minus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_minus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X-[#<xy_clearance> * 2]
-      #<x_minus_probed> = #5061
-      G90
-      G0 X[#<x_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<x_minus_zero_edge> = [#<x_minus_probed> - #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_minus_probed_position> = #<x_minus_zero_edge>
-  
-  (output to gui DRO "X PROBED POSITION")
-  #1005 = #<x_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      o<probe_x_minus_wco> return
-  o130 endif
-
-o<probe_x_minus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc
deleted file mode 100644
index a9db4f83..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X plus direction and set X 0 in current WCO)
-(Start probe position to the left side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_plus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_plus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X[#<max_xy_distance>]
-  #<x_plus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_plus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X[#<xy_clearance> * 2]
-      #<x_plus_probed> = #5061
-      G90
-      G0 X[#<x_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<x_plus_zero_edge> = [#<x_plus_probed> + #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_plus_probed_position> = #<x_plus_zero_edge>
-
-  (output to gui DRO "X PROBED POSITION")
-  #1006 = #<x_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-o<probe_x_plus> endsub [#<x_plus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc
deleted file mode 100644
index 4c50daef..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X plus direction and set X 0 in current WCO)
-(Start probe position to the left side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_plus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_plus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X[#<max_xy_distance>]
-  #<x_plus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_plus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X[#<xy_clearance> * 2]
-      #<x_plus_probed> = #5061
-      G90
-      G0 X[#<x_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<x_plus_zero_edge> = [#<x_plus_probed> + #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_plus_probed_position> = #<x_plus_zero_edge>
-
-  (output to gui DRO "X PROBED POSITION")
-  #1006 = #<x_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      o<probe_x_plus_wco> return
-  o130 endif
-
-o<probe_x_plus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc
deleted file mode 100644
index ee604409..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y Minus direction to locate edge, end at clearance distance)
-(Start probe position to the back side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_minus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_minus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast Y- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 y-[#<max_xy_distance>]
-  #<y_minus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_minus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y-[#<xy_clearance> * 2]
-      #<y_minus_probed> = #5062
-      G90
-      G0 Y[#<y_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<y_minus_zero_edge> = [#5062 - #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_minus_probed_position> = #<y_minus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1007 = #<y_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-o<probe_y_minus> endsub [#<y_minus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc
deleted file mode 100644
index ee98bb70..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y Minus direction and set Y 0 in current WCO)
-(Start probe position to the back side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_minus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_minus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast Y- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 y-[#<max_xy_distance>]
-  #<y_minus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_minus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y-[#<xy_clearance> * 2]
-      #<y_minus_probed> = #5062
-      G90
-      G0 Y[#<y_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<y_minus_zero_edge> = [#5062 - #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_minus_probed_position> = #<y_minus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1007 = #<y_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_y_minus_wco> return
-  o130 endif
-
-o<probe_y_minus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc
deleted file mode 100644
index 874a7b9a..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y plus direction to locate edge, end at clearance distance)
-(Start probe position to the front side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_plus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_plus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast y+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Y[#<max_xy_distance>]
-  #<y_plus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_plus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y[#<xy_clearance> * 2]
-      #<y_plus_probed> = #5062
-      G90
-      G0 Y[#<y_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<y_plus_zero_edge> = [#5062 + #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_plus_probed_position> = #<y_plus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1008 = #<y_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-o<probe_y_plus> endsub [#<y_plus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc
deleted file mode 100644
index 651f03a4..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y plus direction and set Y 0 in current WCO)
-(Start probe position to the front side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_plus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_plus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast y+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Y[#<max_xy_distance>]
-  #<y_plus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_plus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y[#<xy_clearance> * 2]
-      #<y_plus_probed> = #5062
-      G90
-      G0 Y[#<y_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<y_plus_zero_edge> = [#5062 + #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_plus_probed_position> = #<y_plus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1008 = #<y_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_y_plus_wco> return
-  o130 endif
-
-o<probe_y_plus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc
deleted file mode 100644
index 1f2bfa39..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc
+++ /dev/null
@@ -1,64 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Z Minus direction to locate top, end at clearance distance)
-(Start probe position is over stock within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_z_minus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_z_distance> = #2
-  #<z_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o100 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Z#<z>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_z_minus> return
-  o100 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o110 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Z- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Z-[#<z_clearance> * 2]
-      #<z_minus_probed> = #5063
-      G90
-      G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o110 endif
-
-  (defines the edge as z_probed_position for DRO reporting)
-  #<z_minus_probed_position> = #<z_minus_probed>
-
-  (output to gui DRO "Z PROBED POSITION")
-  #1009 = #<z_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-o<probe_z_minus> endsub [#<z_finish_height>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc
deleted file mode 100644
index b74d1f3b..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc
+++ /dev/null
@@ -1,83 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Z Minus direction and set Z 0 in current WCO)
-(Start probe position is over stock within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_z_minus_sub> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_z_distance> = #2
-  #<z_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<probe_mode> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_z_minus_sub> return
-  o100 endif
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Z#<z>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_z_minus_sub> return
-  o110 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Z- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Z-[#<z_clearance> * 2]
-      #<z_minus_probed> = #5063
-      G90
-      G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o120 endif
-
-  (defines the edge as z_probed_position for DRO reporting)
-  #<z_minus_probed_position> = #<z_minus_probed>
-
-  (output to gui DRO "Z PROBED POSITION")
-  #1009 = #<z_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Z zero in selected WCO)
-      G10 L2 P#5220 Z[#<z_minus_probed> + #<workspace_z>]
-      o<probe_z_minus_sub> return
-  o130 endif
-
-o<probe_z_minus_sub> endsub [#<z_finish_height>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc
deleted file mode 100644
index d37ece9d..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc
+++ /dev/null
@@ -1,92 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Z Minus direction and set Z 0 in current WCO)
-(Start probe position is over stock within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_z_minus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_z_minus_wco> return
-  o100 endif
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Z#<z>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_z_minus_wco> return
-  o110 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Z- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Z-[#<z_clearance> * 2]
-      #<z_minus_probed> = #5063
-      G90
-      G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o120 endif
-
-  (defines the edge as z_probed_position for DRO reporting)
-  #<z_minus_probed_position> = #<z_minus_probed>
-
-  (output to gui DRO "Z PROBED POSITION")
-  #1009 = #<z_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Z zero in selected WCO)
-      G10 L2 P#5220 Z[#<z_minus_probed> + #<workspace_z>]
-      o<probe_z_minus_wco> return
-  o130 endif
-
-o<probe_z_minus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc b/linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc
deleted file mode 100644
index 7b114290..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc
+++ /dev/null
@@ -1,74 +0,0 @@
-(author: Chris P, lwk)
-(version: 0.2)
-(date: 12/03/23)
-
-(ini settings required)
-([COOLANT_CANNON])
-(ACTIVATE = 1)
-(HORIZONTAL_SPINDLE_NOZZLE_DIST = 8)
-(VERTICAL_SPINDLE_NOZZLE_DIST = 4)
-(PC_ANGLE_OFFSET = 0)
-
-(programmable coolant subroutine for aiming the coolant nozzle)
-(settings for setup are displayed on probe basic setting page)
-(in the programmable coolant constants container.)
-(calculations assume coolant nozzle is on axis b and has been homed)
-(to 0 degrees rotation aiming perpendicular to the spindle center line)
-(coolant nozzle is located on the right side of the spindle head and)
-(rotates counter clockwise from home position with commands)
-
-o<program_coolant> sub
-(PRINT, o<program_coolant>)
-
-  #<active> = 0
-  o100 if [EXISTS[#<_ini[coolant_cannon]activate>]]
-    #<active> = #<_ini[coolant_cannon]activate>
-  o100 endif
-
-  o110 if [#<active> EQ 0]
-    o110 return
-  o110 endif
-
-  o120 if [EXISTS[#<_ini[coolant_cannon]horizontal_spindle_nozzle_dist>]]
-    #<horizontal_spindle_nozzle_dist> = #<_ini[coolant_cannon]horizontal_spindle_nozzle_dist>
-  o120 else
-    (MSG, Coolant Cannon INI setting missing <HORIZONTAL_SPINDLE_NOZZLE_DIST>)
-    o120 return
-  o120 endif
-
-  o130 if [EXISTS[#<_ini[coolant_cannon]vertical_spindle_nozzle_dist>]]
-    #<vertical_spindle_nozzle_dist> = #<_ini[coolant_cannon]vertical_spindle_nozzle_dist>
-  o130 else
-    (MSG, Coolant Cannon INI setting missing <VERTICAL_SPINDLE_NOZZLE_DIST>)
-    o130 return
-  o130 endif
-
-  o140 if [EXISTS[#<_ini[coolant_cannon]pc_angle_offset>]]
-    #<pc_angle_offset> = #<_ini[coolant_cannon]pc_angle_offset>
-  o140 else
-    (MSG, Coolant Cannon INI setting missing <PC_ANGLE_OFFSET>)
-    o140 return
-  o140 endif
-
-  #<pc_tool_length> = #5403
-
-  #<tool_diameter> = #5410
-
-  #<tool_radius_offset_dist> = [#<tool_diameter> / 2]
-
-  #<tool_diameter_offset_dist> = [#<horizontal_spindle_nozzle_dist> - #<tool_radius_offset_dist>]
-
-  #<tool_tip_position> = [[#<vertical_spindle_nozzle_dist>] + [#<pc_tool_length>]]
-
-  #<coolant_abs_angle> = [ATAN[#<tool_tip_position>] / [#<tool_diameter_offset_dist>]]
-
-  #<coolant_final_angle> = [[#<coolant_abs_angle>] + [#<pc_angle_offset>]]
-
-  #1000 = #<coolant_final_angle>
-  (DEBUG, EVAL[vcp.getWidget{"coolant_final_angle"}.setValue{#1000}])
-
-  M68 E20 Q[#<coolant_final_angle>]
-
-o<program_coolant> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc b/linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc
deleted file mode 100644
index 9b89dde3..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc
+++ /dev/null
@@ -1,41 +0,0 @@
-o<reset_all_data> sub
-
-#1001 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}])
-
-#1002 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}])
-
-#1003 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}])
-
-#1004 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}])
-
-#1005 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-#1006 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-#1007 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-#1008 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-#1009 = 0
-(DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-#1010 = 0
-(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-#1011 = 0
-(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-#1012 = 0
-(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-o<reset_all_data> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/retractatc.ngc b/linuxcnc/configs/probe_basic/subroutines/retractatc.ngc
deleted file mode 100644
index 4219ca38..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/retractatc.ngc
+++ /dev/null
@@ -1,15 +0,0 @@
-o<retractatc> sub
-
-M65 P0 ; Turn off carousel out solenoid
-M64 P1 ; Move Carousel IN
-
-M66 P0 L3 Q4 ; check carousel in position sensor
-o100 if [#5399 LT 0]
-    M65 P1 ; turn off the solenoid to send atc home
-    (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds
-o100 endif
-M65 P1
-
-o<retractatc> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc b/linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc
deleted file mode 100644
index 036d83be..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc
+++ /dev/null
@@ -1,19 +0,0 @@
-o<set_g30_position> sub
-
-o100 if [1 EQ 1]
-    (G30.1 records the tool touch off position in the var file)
-    G30.1
-o100 endif
-
-#1000 = #5181
-(DEBUG, EVAL[vcp.getWidget{"x_tool_change_position"}.setValue{#1000}])
-
-#1001 = #5182
-(DEBUG, EVAL[vcp.getWidget{"y_tool_change_position"}.setValue{#1001}])
-
-#1002 = #5183
-(DEBUG, EVAL[vcp.getWidget{"z_tool_change_position"}.setValue{#1002}])
-
-o<set_g30_position> endsub
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc b/linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc
deleted file mode 100644
index d6904b18..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc
+++ /dev/null
@@ -1,16 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 02/8/20)
-
-(store spindle tool in carousel macro)
-
-o<store_tool_in_carousel> sub
-(PRINT, o<store_tool_in_carousel>)
-
-G49
-
-T0 M6
-
-o<store_tool_in_carousel> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc b/linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc
deleted file mode 100644
index 33f10b14..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc
+++ /dev/null
@@ -1,103 +0,0 @@
-o<tool_touch_off> sub
-
-; NOTE this routine used G59.3, and this needs to be set to 0,0,0 for everything to work correctly
-
-#<fast_probe_fr> = #1    (set from probe screen fast probe feed rate)
-#<slow_probe_fr> = #2    (set from probe screen slow probe feedrate)
-#<z_max_travel> = #3    (max z distance the tool travels before erroring out if not contact is made)
-#<xy_max_travel> = #4    (max xy distance the tool travels before erroring out if not contact is made)
-#<retract_distance> = #6    (distance the tool retracts after making contact during fast feed mode)
-#<spindle_zero_height> = #5    (G53 distance from home to spindle nose triggering point on touch plate)
-#<tool_diameter_probe_mode> = #8    (activates the tool diameter probe subroutine section)
-#<tool_diameter_offset_mode> = #9    (activates the tool diameter offset position for probe subroutine section)
-#<tool_diameter> = #10    (current tool's diameter used for offseting probe position in x axis)
-
-G92.1    (Cancel G92 offset)
-
-#<workspace_z> = #5220
-
-#<tool_touch_x_coords> = #5181
-#<tool_touch_y_coords> = #5182
-#<tool_touch_z_coords> = #5183
-
-#<tool_radius_offset> = [#<tool_diameter> / 2]
-#<offset_probing_position> = [#<tool_touch_x_coords> - #<tool_radius_offset>]
-
-G59.3
-
-o100 if [#<tool_diameter_offset_mode> EQ 1]
-    #<tool_touch_x_coords> = #<offset_probing_position>
-o100 endif
-
-o110 if [2 EQ 2]
-    G49
-o110 endif
-
-G90    (set absolute coordinates)
-G53 G0 Z0    (move to z0 home position)
-G53 G0 X#<tool_touch_x_coords> Y#<tool_touch_y_coords>
-G53 G0 Z#<tool_touch_z_coords>
-
-G91
-F #<fast_probe_fr>
-G38.2 Z-[#<z_max_travel>]    (fast tool probe)
-#<z_fast_probe> = #5063    (save probe result of fast probe to parameters)
-G0 Z[#<retract_distance>]    (retract tool retract distance amount)
-
-(Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-o120 if [#<slow_probe_fr> GT 0]
-    (Initiate Slow Z- Probe)
-    G91
-    F[#<slow_probe_fr>]    (set probe slow feedrate)
-    G38.2 Z-[#<retract_distance> * 2]    (slow tool probe)
-    #<z_slow_probe> = #5063
-    G90
-    G0 Z[#<z_slow_probe> + #<retract_distance>]
-o120 endif
-
-o130 if [#5070 EQ 1]    (verify probe event was succesful)
-    #<z_slow_probe> = #5063    (save slow probe result to parameters)
-o130 else
-    (MSG,Tool Length Offset Probe Failed)
-o130 endif
-
-(Tool Diameter Probe Mode Section, User must define this section as needed)
-o140 if [#<tool_diameter_probe_mode> EQ 1]
-    (MSG, Tool Diameter Probing is Not Defined in Subroutine)
-o140 endif
-
-o150 if [3 EQ 3]
-    G49
-o150 endif
-
-G90    (set absolute coordinates)
-G53 G0 Z0 (Send Spindle to home zero position)
-
-(define new tool length offset parameters)
-#<new_tool_length_offset> = [ABS[#<spindle_zero_height> + #5063]]
-
-G10 L1 P #5400 Z [#<new_tool_length_offset>]  (5400 = tool number)
-
-o160 if [#<workspace_z> EQ 1]
-    G54
-o160 else if [#<workspace_z> EQ 2]
-    G55
-o160 else if [#<workspace_z> EQ 3]
-    G56
-o160 else if [#<workspace_z> EQ 4]
-    G57
-o160 else if [#<workspace_z> EQ 5]
-    G58
-o160 else if [#<workspace_z> EQ 6]
-    G59
-o160 else if [#<workspace_z> EQ 7]
-    G59.1
-o160 else if [#<workspace_z> EQ 8]
-    G59.2
-o160 endif
-
-T #5400 G43  H #5400    (enable tool length offset)
-
-o<tool_touch_off> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc b/linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc
deleted file mode 100644
index 27192776..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc
+++ /dev/null
@@ -1,10 +0,0 @@
-o<tool_touch_off_entire_carousel> sub
-
-; Touch off each tool in the carousel
-(PRINT, o<tool_touch_off_entire_carousel>)
-
-(DEBUG, 'TOUCH OFF ENTIRE CAROUSEL' not yet implemented)
-
-o<tool_touch_off_entire_carousel> endsub
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/toolchange.ngc b/linuxcnc/configs/probe_basic/subroutines/toolchange.ngc
deleted file mode 100644
index 31313ce4..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/toolchange.ngc
+++ /dev/null
@@ -1,130 +0,0 @@
-o<toolchange> sub
-
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
-; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently)
-; Parameter #4000 is not populated just used in the maths to calculate the above numbers
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-(PRINT, o<toolchange> selected_tool: #<selected_tool>, tool_in_spindle: #<tool_in_spindle>, selected_pocket: #<selected_pocket>, current_pocket: #<current_pocket>, task: #<_task>)
-
-o100 if [#<_task> EQ 0]
-    (DEBUG, Task is null)
-    o<toolchange> return [999]
-o100 endif (this code eliminates tool missing error on load for multiple use tools)
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-#<atc_z_tool_change_height> = -3.9000
-o102 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o102 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o103 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o103 endif
-
-; assign the variables passed by M6 change_prolog to some parameters
-#100 = #<selected_tool>
-#110 = #<tool_in_spindle>
-#120 = #<selected_pocket>
-#121 = #<current_pocket>
-; NOTE:
-;      The legacy names *selected_pocket* and *current_pocket* actually reference
-;      a sequential tooldata index for tool items loaded from a tool
-;      table ([EMCIO]TOOL_TABLE) or via a tooldata database ([EMCIO]DB_PROGRAM)
-
-o110 if [#<selected_tool> EQ #<tool_in_spindle>] ; checks if tool in the spindle is same as requested
-    o<toolchange> endsub [1]
-    M2
-o110 endif
-
-o111 if [#3991 NE #<tool_in_spindle>]
-    (PRINT, o<toolchange> tool_in_spindle does not match 3991)
-o111 endif
-
-#<next_pocket> = 0 ; assigns 0 to the next pocket for a later check if the tool is found in the carousel
-#<open_pocket> = 0
-#130 = #<number_of_pockets> ; assign test parameter the number of pockets in the carousel
-
-o120 do
-    o121 if [#[4000 + #130] EQ #<selected_tool>] ; checks all pockets to see if it contains tool number requested as the new tool
-        #<next_pocket> = #130 ; if tool is found in pocket, assigns the next pocket
-    o121 endif
-    o122 if [#[4000 + #130] EQ 0] ; checks if the pocket is empty, last pocket checked will be the lowest empty pocket number, for putting tool in spindle away.
-        #<open_pocket> = #130
-    o122 endif
-    #130 = [#130 - 1]
-o120 while [#130 GT 0]
-o130 if [#<next_pocket> EQ 0] ; if tool is not found, aborts and sends a message
-    (abort, Tool T%d#<selected_tool> not found in carousel)
-o130 endif
-
-; now we know which pocket the next tool is sitting in
-; we need to know if we need to put a tool away
-; or if there is not tool in the spindle
-
-o140 if [#<tool_in_spindle> GT 0] ; checks if there is a valid tool in the spindle
-    o141 if [#<open_pocket> EQ 0] ; If there is a tool in the spindle, checks if there is an open pocket
-        (abort, Carousel is full, cant put away tool T#<tool_in_spindle> in into carousel)
-    o141 endif
-    M10 P[#<open_pocket>] ; move carousel to an open pocket
-    M21 ; puts the tool in spindle away into the open pocket
-    (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#<open_pocket>, #<tool_in_spindle>}])
-    #140 = #<open_pocket>
-    #[4000 + #140] = #<tool_in_spindle> ; save tool number in pocket
-    #3991 = 0 ; empty tool in the spindle
-    M61 Q0
-    G49
-o140 endif
-
-G90
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-o150 if [#<selected_tool> GT 0] ; selected tool is not tool0
-    M10 P#<next_pocket> ; set the carousel to move to the right pocket for the selected tool
-    M65 P1
-    M64 P0
-    M66 P1 L3 Q5 ; check carousel out position sensor
-    o151 if [#5399 LT 0]
-        M65 P0 ; turn off the solenoid to send atc to tool change
-        (abort, Failed to send carousel home) ; abort if the    sensor does not activate in 5 seconds
-    o151 endif
-    M65 P0
-
-    (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#<next_pocket>, 0}])
-    M22 ; Carousel out
-    #150 = #<next_pocket>
-    #[4000 + #150] = 0 ; empty the pocket
-    #3991 = #<selected_tool> ; Set persistent variable to remember tool in spindle after power cycle
-o150 else
-    M65 P2 ; deactive drawbar
-    M65 P0 ; make sure ATC out solenoid is off
-    M64 P1 ; move carousel home
-    M66 P0 L3 Q4 ; check carousel in position sensor
-    o152 if [#5399 LT 0]
-        M65 P1 ; turn off the solenoid to send atc home
-        (abort, Failed to send carousel home) ; abort if the    sensor does not activate in 5 seconds
-    o152 endif
-    M65 P1
-o150 endif
-
-M61 Q#<selected_tool>
-
-o160 if [1 EQ 1]
-    G43 H#<selected_tool>
-o160 endif
-
-o<program_coolant> call
-
-(PRINT, o<toolchange> endsub)
-o<toolchange> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc
deleted file mode 100644
index 61207d8e..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc
+++ /dev/null
@@ -1,87 +0,0 @@
-(author: Chris Polanski)
-(version: 0.1)
-(date: 11/5/22)
-
-(Measure tool and set Z 0.000 in current WCO for new tool)
-
-o<toolsetter_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  
-  #<tool_touch_x_coords> = 33.2
-  #<tool_touch_y_coords> = 4.4
-  #<dust_boot_x_coords> = 26
-  #<dust_boot_y_coords> = 3
-  #<max_z_distance> = 2.5
-  #<tool_setter_height> = 1.8
-  #<z_clearance> = 0.2500
-  #<probe_slow_fr> = 0.0
-  #<probe_fast_fr> = 30.0
- 
-  (start with an m6, do all the standard m6 stuff and then touch off -TMC)
-  M6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  o100 if [2 EQ 2]
-  G49
-  o100 endif
-
-  G90    (set absolute coordinates)
-  G53 G0 Z0    (move to z0 home position)
-  G53 G0 X#<tool_touch_x_coords> Y#<tool_touch_y_coords>
-  
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-    (back to start point and feed)
-    G90
-    G0 Z#<z>
-    F[#<probe_fast_fr>]
-    (return from sub)
-    o<toolsetter_wco> return
-  o110 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-    (Initiate Slow Z- Probe)
-    G91
-    F[#<probe_slow_fr>]
-    G38.2 Z-[#<z_clearance> * 2]
-    #<z_minus_probed> = #5063
-    G90
-    G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o120 endif
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-  #<new_tool_wco_z> = [#<z_minus_probed> - #<tool_setter_height>]
-
-  (Record Z zero in selected WCO)
-  G10 L2 P#5220 Z[#<new_tool_wco_z> + #<workspace_z>]
-
-  (Move to Toolset location)
-  G53 G0 X#<dust_boot_x_coords> Y#<dust_boot_y_coords>
-  
-  (pause for dust boot)
-  M0 (replace the dust boot)
-
-o<toolsetter_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc b/linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc
deleted file mode 100644
index ac9c3798..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc
+++ /dev/null
@@ -1,12 +0,0 @@
-o<unclamptool> sub
-
-M64 P2 ; unclamp the tool
-
-M66 P2 L3 Q2 ; check the unclamped tool sensor
-o100 if [#5399 LT 0]
-    (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds
-o100 endif
-
-o<unclamptool> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc b/linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc
deleted file mode 100644
index 093d30d9..00000000
--- a/linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc
+++ /dev/null
@@ -1,17 +0,0 @@
-o<y_data_reset> sub
-
-#1003 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}])
-
-#1004 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}])
-
-#1007 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-#1008 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-o<y_data_reset> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini b/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini
index 96641200..a75ad8d6 100644
--- a/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini
+++ b/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini
@@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 2.000000
 
 # Prefix to be used
 PROGRAM_PREFIX = ~/linuxcnc/nc_files
-OPEN_FILE = ~/linuxcnc/nc_files/pb_examples/blank.ngc
+OPEN_FILE = ~/linuxcnc/nc_files/probe_basic/examples/blank.ngc
 
 # Introductory graphic
 INTRO_GRAPHIC = linuxcnc.gif
@@ -67,7 +67,8 @@ PROGRAM_EXTENSION = .nc,.txt,.tap Other NC files
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G90 G7 G18
 PARAMETER_FILE = sim-lathe.var
-SUBROUTINE_PATH = subroutines
+# IMPORT: `../../nc_files/probe_basic/lathe` must come first to override some mill based subroutines
+SUBROUTINE_PATH = ../../nc_files/probe_basic/lathe:../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 
 [EMCMOT]
 EMCMOT = motmod
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/clamptool.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/clamptool.ngc
deleted file mode 100644
index 8b1a7b1b..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/clamptool.ngc
+++ /dev/null
@@ -1,12 +0,0 @@
-o<clamptool> sub
-
-M65 P2 ; clamp the tool
-
-M66 P5 L3 Q2 ; check the clamped tool sensor
-o100 if [#5399 LT 0]
-    (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds
-o100 endif
-
-o<clamptool> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc
deleted file mode 100644
index 95828367..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc
+++ /dev/null
@@ -1,28 +0,0 @@
-o<extendatc> sub
-
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-#<atc_z_tool_change_height> = -3.9000
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-M65 P1 ; Turn off carousel home solenoid
-M64 P0 ; Move Carousel OUT
-
-M66 P1 L3 Q5 ; check for carousel out position sensor
-o100 if [#5399 LT 0]
-    M65 P0 ; switch off atc out solenoid
-    (abort, ATC not in position)
-o100 endif
-
-o<extendatc> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc
deleted file mode 100644
index 2562672e..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc
+++ /dev/null
@@ -1,37 +0,0 @@
-o<m10> sub
-
-; Move tool carousel best direction to pocket P
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m10> P#<p>)
-
-o100 if [#3989 NE 1]
-    M13
-o100 endif
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-#<steps> = [#3990 - #<p>]
-(PRINT, o<m10> P#<p>, steps=#<steps>)
-o110 if [#<steps> GT [#<number_of_pockets> / 2]]
-    #<steps>=[#<steps> - #<number_of_pockets>]
-o110 endif
-o120 if [#<steps> LT -[#<number_of_pockets> / 2]]
-    #<steps>=[#<steps> + #<number_of_pockets>]
-o120 endif
-o130 if [#<steps> GT 0]
-    M12 P[#<steps>]
-o130 elseif [#<steps> LT 0]
-    #<steps>=[#<steps> * -1]
-    M11 P[#<steps>]
-o130 endif
-
-(PRINT, o<m10> endsub)
-o<m10> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc
deleted file mode 100644
index 3db74563..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc
+++ /dev/null
@@ -1,50 +0,0 @@
-o<m11> sub
-
-; Move tool carousel CCW Parameter P number of steps
-; Without parameter one step CCW.
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m11> P#<p>)
-
-o100 if [#3989 NE 1]
-    (PRINT, atc not homed, homing)
-    M13
-o100 endif
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-o110 if [EXISTS[#<p>]]
-    #<steps_to_move> = #<p>
-o110 else
-    #<steps_to_move> = 1
-    (tells the atc widget move 1 step reverse)
-o110 endif
-
-(tells the atc widget how many steps to move and start moving reverse)
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#<steps_to_move>, "cw"}])
-
-M64 P4 ; Move atc motor Rev
-
-o120 do
-    M66 P4 L1 Q3 ; wait for rising edge on rotation index
-    o130 if [#5399 LT 0]
-        M65 P4 ; Stop atc motor
-        (abort, Failed to get rotation index)
-    o130 endif
-    #3990 = [[[#3990+2] MOD #<number_of_pockets>]-1] ; Pocket is no.1-#<number_of_pockets>
-    #<steps_to_move> = [#<steps_to_move>-1]
-o120 while [#<steps_to_move> GT 0]
-
-M65 P4 ; Stop motor
-
-#<_my_current_pocket> = #3990
-
-(PRINT, o<m11> endsub)
-o<m11> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc
deleted file mode 100644
index 34f2d6f3..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc
+++ /dev/null
@@ -1,50 +0,0 @@
-o<m12> sub
-
-; Move tool carousel CW Parameter P number of steps
-; Without parameter one step CW.
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<m12> P#<p>)
-
-o100 if [#3989 NE 1]
-    (PRINT, atc not homed, homing)
-    M13
-o100 endif
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-o110 if [EXISTS[#<p>]]
-    #<steps_to_move> = #<p>
-o110 else
-    #<steps_to_move>=1
-    (tells the atc widget move 1 step forward)
-o110 endif
-
-(tells the atc widget how many steps to move and start moving forward)
-(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#<steps_to_move>, "ccw"}])
-
-M64 P3 ; Move atc motor FWD
-
-o120 do
-    M66 P4 L1 Q3 ; wait for rising edge on rotation index
-    o130 if [#5399 LT 0]
-        M65 P3 ; Stop atc motor
-        (abort, Failed to get rotation index)
-    o130 endif
-    #3990 = [[[#3990-2] MOD #<number_of_pockets>]+1] ; Pocket is no.1-#<number_of_pockets>
-    #<steps_to_move> = [#<steps_to_move>-1]
-o120 while [#<steps_to_move> GT 0]
-
-M65 P3 ; Stop motor
-
-#<_my_current_pocket> = #3990
-
-(PRINT, o<m12> endsub)
-o<m12> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc
deleted file mode 100644
index 2e87c9a5..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc
+++ /dev/null
@@ -1,42 +0,0 @@
-o<m22> sub
-
-; Move Carousel to the home position - IN
-; after loading any tool in the current pocket to the spindle
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-(PRINT, o<m22>)
-
-#<atc_z_tool_change_height> = -3.9000
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-;M19 R0 Q2
-M24
-;M19 R0 Q1
-;G90
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
-M65 P2 ; release the drawbar to clamp the tool
-M5
-M66 P5 L3 Q1 ; check the tool clamped sensor
-o100 if [#5399 LT 0]
-    (abort, Failed to reclamp tool)
-o100 endif
-
-M65 P0 ; Move Carousel home
-M66 P0 L3 Q4 ; check carousel in position sensor
-o110 if [#5399 LT 0]
-    M65 P1 ; turn off the solenoid to send atc home
-    (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds
-o110 endif
-
-;M65 P1
-
-(PRINT, o<m22> endsub)
-o<m22> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m23.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m23.ngc
deleted file mode 100644
index e69de29b..00000000
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc
deleted file mode 100644
index 37454968..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc
+++ /dev/null
@@ -1,14 +0,0 @@
-o<m24> sub
-(PRINT, o<m24>)
-
-M64 P2 ; unclamp the tool
-M66 P2 L3 Q2 ; check the unclamped tool sensor
-o100 if [#5399 LT 0]
-    M65 P2 ; turn off the drawbar
-    (abort, failed to release tool) ; abort if the sensor does not activate in 3 seconds
-o100 endif
-
-(PRINT, o<m24> endsub)
-o<m24> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc
deleted file mode 100644
index a1a7ac98..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc
+++ /dev/null
@@ -1,15 +0,0 @@
-o<m25> sub
-(PRINT, o<m25>)
-
-M64 P0 ; Move Carousel out
-
-M66 P1 L3 Q5 ; check for carousel out sensor
-o100 if [#5399 LT 0]
-    M65 P0 ; switch off atc out solenoid
-    (abort, ATC not in position)
-o100 endif
-
-(PRINT, o<m25> endsub)
-o<m25> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m26.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m26.ngc
deleted file mode 100644
index e69de29b..00000000
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc
deleted file mode 100644
index 65e68cdf..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc
+++ /dev/null
@@ -1,20 +0,0 @@
-o<move_head_above_carousel> sub
-
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-#<atc_z_tool_change_height> = -3.9000
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-o<move_head_above_carousel> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc
deleted file mode 100644
index 77215115..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc
+++ /dev/null
@@ -1,18 +0,0 @@
-o<move_tool_to_carousel_height> sub
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-#<atc_z_tool_change_height> = -3.9000
-o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o101 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o102 endif
-
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
-
-o<move_tool_to_carousel_height> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc
deleted file mode 100644
index da9f6901..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc
+++ /dev/null
@@ -1,9 +0,0 @@
-%
-o<on_abort> sub
-
-G90
-G40
-G49
-
-o<on_abort> endsub
-%
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc
deleted file mode 100644
index efb82dcd..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe back left inside corner for x,y,z 0,0,0 position)
-(Start probe position is over back left inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_left_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-  (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-   o<probe_back_left_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_minus_sub" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (MSG, Missing X Sub returned edge parameter, aborting)
-    o<probe_back_left_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (MSG, Missing Y Sub returned edge parameter, aborting)
-    o<probe_back_left_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-    (Record Zero in selected axes and WCO)
-    G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-    G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-    o<probe_rect_pocket> return
-  o130 endif
-
-o<probe_back_left_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc
deleted file mode 100644
index 305b1302..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc
+++ /dev/null
@@ -1,114 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe back left top corner for x,y,z 0,0,0 position)
-(Start probe position is over back left corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_left_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_back_left_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_back_left_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_left_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_back_left_top_corner> return
-  o130 endif
-
-o<probe_back_left_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc
deleted file mode 100644
index 6cbe538c..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe back right inside corner for x,y,z 0,0,0 position)
-(Start probe position is over back right inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_right_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_back_right_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width X and Y)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_back_right_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_right_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_back_right_inside_corner> return
-  o130 endif
-
-o<probe_back_right_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc
deleted file mode 100644
index fd30605d..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc
+++ /dev/null
@@ -1,113 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/23/19)
-
-(Probe back right top corner for x,y,z 0,0,0 position)
-(Start probe position is over back right corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_back_right_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_back_right_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_back_right_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  (Probe Y Positioning Move)
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_right_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_back_right_top_corner> return
-  o130 endif
-
-o<probe_back_right_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc
deleted file mode 100644
index 46e705be..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe back top side for y,z 0,0 position)
-(Start probe position is over back edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_back_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_back_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_back_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_back_top_side> return
-  o120 endif
-
-o<Probe_back_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc
deleted file mode 100644
index 866e8ef1..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc
+++ /dev/null
@@ -1,8 +0,0 @@
-o<probe_cal_reset> sub
-
-  #1000 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-
-o<probe_cal_reset> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc
deleted file mode 100644
index e9dcbd00..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc
+++ /dev/null
@@ -1,325 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined diam round boss)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_cal_round_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<cal_diameter> = #16        (=1.0000)
-  #<sq_cal_axis> = #17         (=0)
-  #<max_vel_slider> = #18      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_cal_round_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Move to z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Move to Y Center)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 X[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  o110 if [#<x_minus_probed> GT #<x_plus_probed>]
-    #<x_raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-  o110 else
-      #<x_raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-  o110 endif
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<x_raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<cal_diameter>/2 + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 Y[#<cal_diameter> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  o120 if [#<y_minus_probed> GT #<y_plus_probed>]
-      #<y_raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-  o120 else
-      #<y_raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-      o<probe_round_boss> return
-  o120 endif
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<y_raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  o130 if [#<cal_diameter> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<cal_diameter> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o130 else
-      #<x_cal_error> = [[#<x_probed_width> - #<cal_diameter>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o130 endif
-
-  o140 if [#<cal_diameter> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<cal_diameter> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o140 else
-      #<y_cal_error> = [[#<y_probed_width> - #<cal_diameter>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o140 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o150 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o150 else if [#<sq_cal_axis> EQ 1]
-    #1000 = [ABS[#<new_x_cal_offset>]]
-    (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o150 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o150 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o160 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      o<probe_cal_round_boss> return
-  o160 endif
-
-o<probe_cal_round_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc
deleted file mode 100644
index fb372418..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc
+++ /dev/null
@@ -1,218 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined diam round pocket)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_cal_round_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<cal_diameter> = #16        (=1.0000)
-  #<sq_cal_axis> = #17         (=0)
-  #<max_vel_slider> = #18      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-       o<probe_cal_round_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed diameter calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  o110 if [#<cal_diameter> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<cal_diameter> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 else
-      #<x_cal_error> = [[#<x_probed_width> - #<cal_diameter>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 endif
-
-  o120 if [#<cal_diameter> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<cal_diameter> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 else
-      #<y_cal_error> = [[#<y_probed_width> - #<cal_diameter>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o130 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else if [#<sq_cal_axis> EQ 1]
-      #1000 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o140 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_cal_round_pocket> return
-  o140 endif
-
-o<probe_cal_round_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc
deleted file mode 100644
index 60c51131..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc
+++ /dev/null
@@ -1,220 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined width square boss)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_cal_square_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<x_cal_width> = #16         (=0)
-  #<y_cal_width> = #17         (=0)
-  #<sq_cal_axis> = #18         (=0)
-  #<max_vel_slider> = #19      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_cal_square_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<x_cal_width>/2 + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_cal_width> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<y_cal_width>/2 + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_cal_width> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  o110 if [#<x_cal_width> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<x_cal_width> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 else
-      #<x_cal_error> = [[#<x_probed_width> - #<x_cal_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 endif
-
-  o120 if [#<y_cal_width> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<y_cal_width> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 else
-      #<y_cal_error> = [[#<y_probed_width> - #<y_cal_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o130 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else if [#<sq_cal_axis> EQ 1]
-      #1000 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o140 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_cal_square_boss> return
-  o140 endif
-
-o<probe_cal_square_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc
deleted file mode 100644
index d6834bc5..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc
+++ /dev/null
@@ -1,172 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 05/8/19)
-
-(Probe calibration offset using defined width square pocket)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_cal_square_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<x_cal_width> = #16         (=1.0000)
-  #<y_cal_width> = #17         (=1.0000)
-  #<sq_cal_axis> = #18         (=0)
-  #<max_vel_slider> = #19      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_cal_square_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter>]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  o110 if [#<x_cal_width> GT #<x_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<x_cal_error> = [[#<x_cal_width> - #<x_probed_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 else
-      #<x_cal_error> = [[#<x_probed_width> - #<x_cal_width>] / 2]
-      #<new_x_cal_offset> = [#<x_cal_error>]
-  o110 endif
-
-  o120 if [#<y_cal_width> GT #<y_probed_width>]
-      (calculate calibration error and adjust calibration offset)
-      #<y_cal_error> = [[#<y_cal_width> - #<y_probed_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 else
-      #<y_cal_error> = [[#<y_probed_width> - #<y_cal_width>] / 2]
-      #<new_y_cal_offset> = [#<y_cal_error>]
-  o120 endif
-
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
-
-  o130 if [#<sq_cal_axis> EQ 0]
-      #1000 = [ABS[#<new_avg_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else if [#<sq_cal_axis> EQ 1]
-      #1000 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 else
-      #1000 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
-  o130 endif
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o140 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      o<probe_cal_square_pocket> return
-  o140 endif
-
-o<probe_cal_square_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc
deleted file mode 100644
index a1b02431..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe front left inside corner for x,y,z 0,0,0 position)
-(Start probe position is over front left inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_left_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-    (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-    o<probe_front_left_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_left_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_left_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_front_left_inside_corner> return
-  o130 endif
-
-o<probe_front_left_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc
deleted file mode 100644
index b523777b..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc
+++ /dev/null
@@ -1,114 +0,0 @@
-(author: Chris P)
-(version: 0.4)
-(date: 04/25/19)
-
-(Probe front left top corner for x,y,z 0,0,0 position)
-(Start probe position is over front left corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_left_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-    (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-     o<probe_front_left_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_left_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane)
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_left_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_front_left_top_corner> return
-  o130 endif
-
-o<probe_front_left_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc
deleted file mode 100644
index bfda031b..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc
+++ /dev/null
@@ -1,118 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/23/19)
-
-(Probe front right inside corner for x,y,z 0,0,0 position)
-(Start probe position is over front right inside corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_right_inside_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_front_right_inside_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width X and Y)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  G90
-  (Current X Position including offsets in current program units)
-  #<x_start> = #5420
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
- (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_right_inside_corner> return
-  o110 endif
-
-  (move to X start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_start>]
-
-  (Current Y Position including offsets in current program units)
-  #<y_start> = #5421
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_right_inside_corner> return
-  o120 endif
-
-  (move to Y start Position)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_start>]
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>] Y[#<y_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_front_right_inside_corner> return
-  o130 endif
-
-o<probe_front_right_inside_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc
deleted file mode 100644
index 875808cf..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc
+++ /dev/null
@@ -1,115 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/23/19)
-
-(Probe front right top corner for x,y,z 0,0,0 position)
-(Start probe position is over front right corner of stock)
-(inside the step off width square and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_front_right_top_corner> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_front_right_top_corner> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_front_right_top_corner> return
-  o110 endif
-
-  (Probe Y Positioning Move, up to Z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Probe Y Positioning Move, Traverse Workpiece Top at Z Clearance Height plane)
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>] Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move,to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y- side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_right_top_corner> return
-  o120 endif
-
-  (Probe Completion Move to Z Clearance Plane, and XY Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>] Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_front_right_top_corner> return
-  o130 endif
-
-o<probe_front_right_top_corner> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc
deleted file mode 100644
index cb444882..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.4)
-(date: 04/25/19)
-
-(Probe front top side for y,z 0,0 position)
-(Start probe position is over front edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_front_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-    (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_front_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing Y Sub returned edge parameter, aborting)
-      o<probe_front_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_front_top_side> return
-  o120 endif
-
-o<Probe_front_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc
deleted file mode 100644
index 7913a715..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe left top side for x,z 0,0 position)
-(Start probe position is over left side edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_left_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_left_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  #<max_vel_slider> = #16      (=50) Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_left_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_plus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      o<probe_left_top_side> return
-  o120 endif
-
-o<Probe_left_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc
deleted file mode 100644
index bb60abc7..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc
+++ /dev/null
@@ -1,182 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/27/19)
-
-(Probe Boss in X and Y Axes, find center and z 0 position)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_rect_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint_0> = #11            (=1.0000)
-  #<y_hint_0> = #12            (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_rect_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<x_hint_0>/2] + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_hint_0> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<y_hint_0>/2] + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_hint_0> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>] Y[#<y_center_probed> + #<workspace_y>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_rect_boss> return
-  o110 endif
-
-o<probe_rect_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc
deleted file mode 100644
index 12ef0e40..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc
+++ /dev/null
@@ -1,134 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/26/19)
-
-(Probe rect pocket center measure x and widths, find xy center position)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_rect_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint_0> = #11            (=1.0000)
-  #<y_hint_0> = #12            (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_rect_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>] Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_rect_pocket> return
-  o110 endif
-
-o<probe_rect_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc
deleted file mode 100644
index 4a87bda7..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc
+++ /dev/null
@@ -1,116 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 01/16/23)
-
-(Probe rect pocket center measure x and y widths, find xy center position)
-(Start probe position is rough center of pocket probe tip below top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_rect_pocket_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint_0> = #11            (=1.0000)
-  #<y_hint_0> = #12            (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_rect_pocket_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3 + #11 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to X Zero, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X and Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>] Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_rect_pocket_center_start> return
-  o110 endif
-
-o<probe_rect_pocket_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc
deleted file mode 100644
index 3372002a..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc
+++ /dev/null
@@ -1,124 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe Ridge in X Axis to find center and z 0 position)
-(Start probe position is over center of stock in the X axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_ridge_x> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=100)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_ridge_x> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<x_hint>/2] + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_hint> + #<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      o<probe_ridge_x> return
-  o110 endif
-
-o<probe_ridge_x> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc
deleted file mode 100644
index dfb0518a..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc
+++ /dev/null
@@ -1,125 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/24/19)
-
-(Probe Ridge in Y Axis to find center and z 0 position)
-(Start probe position is over center of stock in the Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_ridge_y> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_ridge_y> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<y_hint>/2] + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  #<max_vel_slider> = #16      (=50) Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_hint> + #<step_off_width>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  #<max_vel_slider> = #16      (=50) Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_ridge_y> return
-  o110 endif
-
-o<probe_ridge_y> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc
deleted file mode 100644
index 3902c324..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc
+++ /dev/null
@@ -1,88 +0,0 @@
-(author: Chris P)
-(version: 0.3)
-(date: 04/25/19)
-
-(Probe right top side for x,z 0,0 position)
-(Start probe position is over right side edge of stock)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<Probe_right_top_side> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<Probe_right_top_side> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probing depth from the z probed clearance height, used for z moves)
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_zero_edge> = #<_value>
-
-  (value returned safety check, aborts if no value returned)
-  o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (MSG, Missing X Sub returned edge parameter, aborting)
-      o<probe_right_top_side> return
-  o110 endif
-
-  (Probe Completion Move to Z Clearance Plane, and Y Zero)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_minus_zero_edge>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o120 if [#<probe_mode> EQ 0]
-      (Record Zero in selected axes and WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      o<probe_right_top_side> return
-  o120 endif
-
-o<Probe_right_top_side> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc
deleted file mode 100644
index 2b9a5b63..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc
+++ /dev/null
@@ -1,292 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/27/19)
-
-(Probe Boss in X and Y Axes, find center, Diam and z 0 position)
-(Start probe position is over center of stock in X and Y axis)
-(within max z distance, ensure all settings have been)
-(set properly according to help diagrams)
-
-o<probe_round_boss> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<diameter_hint> = #11       (=1.0000)
-  #<diameter_hint> = #12       (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_round_boss> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Move to z clearance plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Move to Y Center)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Probe X Positioning Move, X hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in X, X Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 X[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (probed center calulation)
-  #<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
-
-  (calculate X Width Probed)
-  o110 if [#<x_minus_probed> GT #<x_plus_probed>]
-      #<x_raw_width> = [#<x_minus_probed> - #<x_plus_probed>]
-  o110 else
-      #<x_raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-  o110 endif
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<x_raw_width> - #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Probe Y Positioning Move, Y hint/2 + Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[[#<diameter_hint> / 2] + [#<step_off_width>]]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (first side Probe Completion Move to Z Clearance Plane)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed)
-  F[#<max_vel_slider>]
-  G38.3 Y[#<diameter_hint> + #<step_off_width> + #<xy_clearance>]
-
-  (Probe Y Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  F[#<max_vel_slider>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_minus" to Probe y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calulation)
-  #<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  o120 if [#<y_minus_probed> GT #<y_plus_probed>]
-      #<y_raw_width> = [#<y_minus_probed> - #<y_plus_probed>]
-  o120 else
-      #<y_raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-  o120 endif
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<y_raw_width> - #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>] Y[#<y_center_probed>]
-
-  #<x_zero> = [#<x_center_probed> + #<workspace_x>]
-
-  #<y_zero> = [#<y_center_probed> + #<workspace_y>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record XY Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_zero>] Y[#<y_zero>]
-      o<probe_cal_round_boss> return
-  o130 endif
-
-o<probe_round_boss> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc
deleted file mode 100644
index 24c4ac0f..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc
+++ /dev/null
@@ -1,182 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/26/19)
-
-(Probe round pocket center measure x and y Diam, find xy center position)
-(Start probe position is over left side edge of pocket wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_round_pocket> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_round_pocket> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed diameter calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
-      o<probe_round_pocket> return
-  o110 endif
-
-o<probe_round_pocket> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc
deleted file mode 100644
index 1a4087aa..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc
+++ /dev/null
@@ -1,164 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/26/19)
-
-(Probe round pocket center start measure x and y Diam, find xy center position)
-(Start probe position is rough center of pocket a safe distance below top edge)
-(no z move will be initiated in this routine. end position is hole center)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_round_pocket_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_round_pocket_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 +#13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Y Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (Call sub "probe_x_minus" to Probe x-)
-  o<probe_x_minus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+)
-  o<probe_x_plus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (Call sub "probe_y_plus" to Probe Y+)
-  o<probe_y_plus> call [#1][#3 + #13 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus" to Probe Y-)
-  o<probe_y_minus> call [#1][#3 + #13][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed diameter calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  #<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
-
-  #1010 = #<averaged_diam>
-  (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_round_pocket_center_start> return
-  o110 endif
-
-o<probe_round_pocket_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc
deleted file mode 100644
index 3976664a..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc
+++ /dev/null
@@ -1,105 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe valley in x, find Z0, X0 valley center position)
-(Start probe position is over left side edge of valley wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_x> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_x> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe X Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 X[#<step_off_width>]
-
-  (Probe X Positioning Move, to Probing Depth)
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      o<probe_valley_x> return
-  o110 endif
-
-
-o<probe_valley_x> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc
deleted file mode 100644
index ede6ab52..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc
+++ /dev/null
@@ -1,86 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 01/16/23)
-
-(Probe valley in x, find X zero valley center position)
-(Start probe position is centered between valley walls)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_x_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_x_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_x_minus" to Probe x- side of Workpiece)
-  o<probe_x_minus> call [#1][#3 + #11 / 2][#4][#8][#9][#10]
-
-  #<x_minus_probed> = #5061
-
-  (Call sub "probe_x_plus" to Probe x+ side of Workpiece)
-  o<probe_x_plus> call [#1][#3 + #11][#4][#8][#9][#10]
-
-  #<x_plus_probed> = #5061
-
-  (probed center calculation)
-  #<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
-
-  (calculate X Width Probed)
-  #<raw_width> = [#<x_plus_probed> - #<x_minus_probed>]
-
-  (Completed probed width calculations)
-  #<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1001 = #<x_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
-
-  #1002 = #<x_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
-
-  (Probe Completion Move to X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 X[#<x_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_center_probed> + #<workspace_x>]
-      o<probe_valley_x_center_start> return
-  o110 endif
-
-o<probe_valley_x_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc
deleted file mode 100644
index 50f8e37f..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 04/25/19)
-
-(Probe valley in Y, find Z0, Y0 valley center position)
-(Start probe position is over back side edge of valley wall)
-(inside the step off width distance and within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_y> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_y> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  #<z_probe_stack> = [#<z_clearance> + #<probe_diameter> + #<extra_probe_depth>]
-
-  (Call sub "probe_z_minus_sub" to Probe top of Workpiece)
-  o<probe_z_minus_sub> call [#1][#2][#5][#8][#9][#15]
-
-  (Probe Y Positioning Move, Step Off Width)
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Y-[#<step_off_width>]
-  F[#<probe_fast_fr>]
-  G38.3 Z-[#<z_probe_stack>]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-  G91
-  F[#<max_vel_slider>]
-  G38.3 Z[#<z_probe_stack>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_valley_y> return
-  o110 endif
-
-o<probe_valley_y> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc
deleted file mode 100644
index 3d5b2b12..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc
+++ /dev/null
@@ -1,86 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 01/16/23)
-
-(Probe valley in Y find Y0 valley center position)
-(Start probe position is rough center between valley walls)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_valley_y_center_start> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-  #<max_vel_slider> = #16      (=50)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_valley_y_center_start> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (remove probe tip diam and cal offset from probed width calculations)
-  #<probe_diameter_offset> = [#<probe_diameter> - [#<calibration_offset> * 2]]
-
-  (Call sub "probe_y_plus" to Probe Y+ side of Workpiece)
-  o<probe_y_plus> call [#1][#3 + #12 / 2][#4][#8][#9][#10]
-
-  #<y_plus_probed> = #5062
-
-  (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece)
-  o<probe_y_minus> call [#1][#3 + #12][#4][#8][#9][#10]
-
-  #<y_minus_probed> = #5062
-
-  (probed center calculation)
-  #<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
-
-  (calculate Y Width Probed)
-  #<raw_width> = [#<y_plus_probed> - #<y_minus_probed>]
-
-  (Completed probed width calculations)
-  #<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
-
-  #1003 = #<y_probed_width>
-  (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
-
-  #1004 = #<y_center_probed>
-  (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
-
-  (Probe Completion Move to Z Clearance Plane, and X Zero)
-  G90
-  F[#<max_vel_slider>]
-  G38.3 Y[#<y_center_probed>]
-
-  (probe mode rules for WCO or probe position measuring only)
-  o110 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_center_probed> + #<workspace_y>]
-      o<probe_valley_y_center_start> return
-  o110 endif
-
-o<probe_valley_y_center_start> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc
deleted file mode 100644
index ebd5a6cd..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X Minus direction and set X 0 in current WCO)
-(Start probe position to the right side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_minus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_minus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X-[#<max_xy_distance>]
-  #<x_minus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_minus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X-[#<xy_clearance> * 2]
-      #<x_minus_probed> = #5061
-      G90
-      G0 X[#<x_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<x_minus_zero_edge> = [#<x_minus_probed> - #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_minus_probed_position> = #<x_minus_zero_edge>
-
-  (output to gui DRO "X PROBED POSITION")
-  #1005 = #<x_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-o<probe_x_minus> endsub [#<x_minus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc
deleted file mode 100644
index 5bcbb495..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X Minus direction and set X 0 in current WCO)
-(Start probe position to the right side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_minus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_minus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X-[#<max_xy_distance>]
-  #<x_minus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_minus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X-[#<xy_clearance> * 2]
-      #<x_minus_probed> = #5061
-      G90
-      G0 X[#<x_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<x_minus_zero_edge> = [#<x_minus_probed> - #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_minus_probed_position> = #<x_minus_zero_edge>
-  
-  (output to gui DRO "X PROBED POSITION")
-  #1005 = #<x_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_minus_zero_edge> + #<workspace_x>]
-      o<probe_x_minus_wco> return
-  o130 endif
-
-o<probe_x_minus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc
deleted file mode 100644
index a9db4f83..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X plus direction and set X 0 in current WCO)
-(Start probe position to the left side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_plus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_plus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X[#<max_xy_distance>]
-  #<x_plus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_plus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X[#<xy_clearance> * 2]
-      #<x_plus_probed> = #5061
-      G90
-      G0 X[#<x_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<x_plus_zero_edge> = [#<x_plus_probed> + #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_plus_probed_position> = #<x_plus_zero_edge>
-
-  (output to gui DRO "X PROBED POSITION")
-  #1006 = #<x_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-o<probe_x_plus> endsub [#<x_plus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc
deleted file mode 100644
index 4c50daef..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe X plus direction and set X 0 in current WCO)
-(Start probe position to the left side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_x_plus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_x> = #[5201 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_x_plus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current X Position including offsets in current program units)
-  #<x> = #5420
-
-  (Initiate Fast X+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 X[#<max_xy_distance>]
-  #<x_plus_probed> = #5061
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 X#<x>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_x_plus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 X[#<x_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow X+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 X[#<xy_clearance> * 2]
-      #<x_plus_probed> = #5061
-      G90
-      G0 X[#<x_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<x_plus_zero_edge> = [#<x_plus_probed> + #<probe_center_offset>]
-
-  (defines the edge as x_probed_position for DRO reporting)
-  #<x_plus_probed_position> = #<x_plus_zero_edge>
-
-  (output to gui DRO "X PROBED POSITION")
-  #1006 = #<x_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record X Zero in selected WCO)
-      G10 L2 P#5220 X[#<x_plus_zero_edge> + #<workspace_x>]
-      o<probe_x_plus_wco> return
-  o130 endif
-
-o<probe_x_plus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc
deleted file mode 100644
index ee604409..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y Minus direction to locate edge, end at clearance distance)
-(Start probe position to the back side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_minus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_minus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast Y- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 y-[#<max_xy_distance>]
-  #<y_minus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_minus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y-[#<xy_clearance> * 2]
-      #<y_minus_probed> = #5062
-      G90
-      G0 Y[#<y_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<y_minus_zero_edge> = [#5062 - #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_minus_probed_position> = #<y_minus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1007 = #<y_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-o<probe_y_minus> endsub [#<y_minus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc
deleted file mode 100644
index ee98bb70..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y Minus direction and set Y 0 in current WCO)
-(Start probe position to the back side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_minus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_minus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast Y- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 y-[#<max_xy_distance>]
-  #<y_minus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_minus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_minus_probed> + #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y-[#<xy_clearance> * 2]
-      #<y_minus_probed> = #5062
-      G90
-      G0 Y[#<y_minus_probed> + #<xy_clearance>]
-  o120 endif
-
-  #<y_minus_zero_edge> = [#5062 - #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_minus_probed_position> = #<y_minus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1007 = #<y_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
-      o<probe_y_minus_wco> return
-  o130 endif
-
-o<probe_y_minus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc
deleted file mode 100644
index 874a7b9a..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc
+++ /dev/null
@@ -1,84 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y plus direction to locate edge, end at clearance distance)
-(Start probe position to the front side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_plus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_xy_distance> = #2
-  #<xy_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<calibration_offset> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_plus> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast y+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Y[#<max_xy_distance>]
-  #<y_plus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_plus> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y[#<xy_clearance> * 2]
-      #<y_plus_probed> = #5062
-      G90
-      G0 Y[#<y_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<y_plus_zero_edge> = [#5062 + #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_plus_probed_position> = #<y_plus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1008 = #<y_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-o<probe_y_plus> endsub [#<y_plus_zero_edge>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc
deleted file mode 100644
index 651f03a4..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc
+++ /dev/null
@@ -1,102 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Y plus direction and set Y 0 in current WCO)
-(Start probe position to the front side edge of stock)
-(inside the max xy distance with the probe tip below the stock top edge)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_y_plus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_y> = #[5202 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_y_plus_wco> return
-  o100 endif
-
-  (Probe Diameter)
-  #<probe_diameter> = #5410
-
-  (Probe Radius)
-  #<probe_radius> = [#<probe_diameter> / 2]
-
-  (Probe Centerline Offset)
-  #<probe_center_offset> = [#<probe_radius> - #<calibration_offset>]
-
-  (Current Y Position including offsets in current program units)
-  #<y> = #5421
-
-  (Initiate Fast y+ Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Y[#<max_xy_distance>]
-  #<y_plus_probed> = #5062
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Y#<y>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_y_plus_wco> return
-  o110 endif
-
-  (Move to xy_clearance distance for slow probe)
-  G90
-  G0 Y[#<y_plus_probed> - #<xy_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Y+ Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Y[#<xy_clearance> * 2]
-      #<y_plus_probed> = #5062
-      G90
-      G0 Y[#<y_plus_probed> - #<xy_clearance>]
-  o120 endif
-
-  #<y_plus_zero_edge> = [#5062 + #<probe_center_offset>]
-
-  (defines the edge as y_probed_position for DRO reporting)
-  #<y_plus_probed_position> = #<y_plus_zero_edge>
-
-  (output to gui DRO "Y PROBED POSITION")
-  #1008 = #<y_plus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Y Zero in selected WCO)
-      G10 L2 P#5220 Y[#<y_plus_zero_edge> + #<workspace_y>]
-      o<probe_y_plus_wco> return
-  o130 endif
-
-o<probe_y_plus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc
deleted file mode 100644
index 1f2bfa39..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc
+++ /dev/null
@@ -1,64 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Z Minus direction to locate top, end at clearance distance)
-(Start probe position is over stock within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_z_minus> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_z_distance> = #2
-  #<z_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o100 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Z#<z>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_z_minus> return
-  o100 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o110 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Z- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Z-[#<z_clearance> * 2]
-      #<z_minus_probed> = #5063
-      G90
-      G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o110 endif
-
-  (defines the edge as z_probed_position for DRO reporting)
-  #<z_minus_probed_position> = #<z_minus_probed>
-
-  (output to gui DRO "Z PROBED POSITION")
-  #1009 = #<z_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-o<probe_z_minus> endsub [#<z_finish_height>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc
deleted file mode 100644
index b74d1f3b..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc
+++ /dev/null
@@ -1,83 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Z Minus direction and set Z 0 in current WCO)
-(Start probe position is over stock within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_z_minus_sub> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1
-  #<max_z_distance> = #2
-  #<z_clearance> = #3
-  #<probe_slow_fr> = #4
-  #<probe_fast_fr> = #5
-  #<probe_mode> = #6
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_z_minus_sub> return
-  o100 endif
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Z#<z>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_z_minus_sub> return
-  o110 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Z- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Z-[#<z_clearance> * 2]
-      #<z_minus_probed> = #5063
-      G90
-      G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o120 endif
-
-  (defines the edge as z_probed_position for DRO reporting)
-  #<z_minus_probed_position> = #<z_minus_probed>
-
-  (output to gui DRO "Z PROBED POSITION")
-  #1009 = #<z_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Z zero in selected WCO)
-      G10 L2 P#5220 Z[#<z_minus_probed> + #<workspace_z>]
-      o<probe_z_minus_sub> return
-  o130 endif
-
-o<probe_z_minus_sub> endsub [#<z_finish_height>]
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc
deleted file mode 100644
index d37ece9d..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc
+++ /dev/null
@@ -1,92 +0,0 @@
-(author: Chris P)
-(version: 0.1)
-(date: 08/13/2023)
-
-(Probe Z Minus direction and set Z 0 in current WCO)
-(Start probe position is over stock within max z distance)
-(ensure all settings have been set properly according to help diagrams)
-
-o<probe_z_minus_wco> sub
-
-  (uses NGCGUI style arg spec)
-  (number after "=" in comment is default value)
-  #<probe_tool_number> = #1    (=99)
-  #<max_z_distance> = #2       (=0.5000)
-  #<max_xy_distance> = #3      (=0.5000)
-  #<xy_clearance> = #4         (=0.1000)
-  #<z_clearance> = #5          (=0.1000)
-  #<step_off_width> = #6       (=0.5000)
-  #<extra_probe_depth> = #7    (=0.0000)
-  #<probe_slow_fr> = #8        (=0.0)
-  #<probe_fast_fr> = #9        (=10.0)
-  #<calibration_offset> = #10  (=0.0000)
-  #<x_hint> = #11              (=1.0000)
-  #<y_hint> = #12              (=1.0000)
-  #<diameter_hint> = #13       (=1.0000)
-  #<edge_width> = #14          (=0.5000)
-  #<probe_mode> = #15          (=0)
-
-  (Cancel G92 offsets)
-  G92.1
-
-  #<workspace_z> = #[5203 + [20 * #5220]]
-
-  (Probe Tool Safety Check)
-  o100 if [#5400 NE #<probe_tool_number>]
-      (MSG, Specified probe tool #<probe_tool_number> not in spindle, aborting)
-      o<probe_z_minus_wco> return
-  o100 endif
-
-  (Current Z Position including offsets in current program units)
-  #<z> = #5422
-
-  (Initial Fast Z- Probe)
-  G91
-  F[#<probe_fast_fr>]
-  G38.2 Z-[#<max_z_distance>]
-  #<z_minus_probed> = #5063
-
-  (Probe Error check, #5070 will be 0 if failed)
-  o110 if [#5070 EQ 0]
-      (back to start point and feed)
-      G90
-      G0 Z#<z>
-      F[#<probe_fast_fr>]
-      (return from sub)
-      o<probe_z_minus_wco> return
-  o110 endif
-
-  (Move to z_clearance height for slow probe)
-  G90
-  G0 Z[#<z_minus_probed> + #<z_clearance>]
-
-  (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-  o120 if [#<probe_slow_fr> GT 0]
-      (Initiate Slow Z- Probe)
-      G91
-      F[#<probe_slow_fr>]
-      G38.2 Z-[#<z_clearance> * 2]
-      #<z_minus_probed> = #5063
-      G90
-      G0 Z[#<z_minus_probed> + #<z_clearance>]
-  o120 endif
-
-  (defines the edge as z_probed_position for DRO reporting)
-  #<z_minus_probed_position> = #<z_minus_probed>
-
-  (output to gui DRO "Z PROBED POSITION")
-  #1009 = #<z_minus_probed_position>
-  (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-  #<z_finish_height> = [#<z_minus_probed> + #<z_clearance>]
-
-  (probe mode rule for WCO or probe position measuring only)
-  o130 if [#<probe_mode> EQ 0]
-      (Record Z zero in selected WCO)
-      G10 L2 P#5220 Z[#<z_minus_probed> + #<workspace_z>]
-      o<probe_z_minus_wco> return
-  o130 endif
-
-o<probe_z_minus_wco> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc
deleted file mode 100644
index 7b114290..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc
+++ /dev/null
@@ -1,74 +0,0 @@
-(author: Chris P, lwk)
-(version: 0.2)
-(date: 12/03/23)
-
-(ini settings required)
-([COOLANT_CANNON])
-(ACTIVATE = 1)
-(HORIZONTAL_SPINDLE_NOZZLE_DIST = 8)
-(VERTICAL_SPINDLE_NOZZLE_DIST = 4)
-(PC_ANGLE_OFFSET = 0)
-
-(programmable coolant subroutine for aiming the coolant nozzle)
-(settings for setup are displayed on probe basic setting page)
-(in the programmable coolant constants container.)
-(calculations assume coolant nozzle is on axis b and has been homed)
-(to 0 degrees rotation aiming perpendicular to the spindle center line)
-(coolant nozzle is located on the right side of the spindle head and)
-(rotates counter clockwise from home position with commands)
-
-o<program_coolant> sub
-(PRINT, o<program_coolant>)
-
-  #<active> = 0
-  o100 if [EXISTS[#<_ini[coolant_cannon]activate>]]
-    #<active> = #<_ini[coolant_cannon]activate>
-  o100 endif
-
-  o110 if [#<active> EQ 0]
-    o110 return
-  o110 endif
-
-  o120 if [EXISTS[#<_ini[coolant_cannon]horizontal_spindle_nozzle_dist>]]
-    #<horizontal_spindle_nozzle_dist> = #<_ini[coolant_cannon]horizontal_spindle_nozzle_dist>
-  o120 else
-    (MSG, Coolant Cannon INI setting missing <HORIZONTAL_SPINDLE_NOZZLE_DIST>)
-    o120 return
-  o120 endif
-
-  o130 if [EXISTS[#<_ini[coolant_cannon]vertical_spindle_nozzle_dist>]]
-    #<vertical_spindle_nozzle_dist> = #<_ini[coolant_cannon]vertical_spindle_nozzle_dist>
-  o130 else
-    (MSG, Coolant Cannon INI setting missing <VERTICAL_SPINDLE_NOZZLE_DIST>)
-    o130 return
-  o130 endif
-
-  o140 if [EXISTS[#<_ini[coolant_cannon]pc_angle_offset>]]
-    #<pc_angle_offset> = #<_ini[coolant_cannon]pc_angle_offset>
-  o140 else
-    (MSG, Coolant Cannon INI setting missing <PC_ANGLE_OFFSET>)
-    o140 return
-  o140 endif
-
-  #<pc_tool_length> = #5403
-
-  #<tool_diameter> = #5410
-
-  #<tool_radius_offset_dist> = [#<tool_diameter> / 2]
-
-  #<tool_diameter_offset_dist> = [#<horizontal_spindle_nozzle_dist> - #<tool_radius_offset_dist>]
-
-  #<tool_tip_position> = [[#<vertical_spindle_nozzle_dist>] + [#<pc_tool_length>]]
-
-  #<coolant_abs_angle> = [ATAN[#<tool_tip_position>] / [#<tool_diameter_offset_dist>]]
-
-  #<coolant_final_angle> = [[#<coolant_abs_angle>] + [#<pc_angle_offset>]]
-
-  #1000 = #<coolant_final_angle>
-  (DEBUG, EVAL[vcp.getWidget{"coolant_final_angle"}.setValue{#1000}])
-
-  M68 E20 Q[#<coolant_final_angle>]
-
-o<program_coolant> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc
deleted file mode 100644
index 9b89dde3..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc
+++ /dev/null
@@ -1,41 +0,0 @@
-o<reset_all_data> sub
-
-#1001 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}])
-
-#1002 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}])
-
-#1003 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}])
-
-#1004 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}])
-
-#1005 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-#1006 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-#1007 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}])
-
-#1008 = 0
-(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}])
-
-#1009 = 0
-(DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}])
-
-#1010 = 0
-(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
-
-#1011 = 0
-(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
-
-#1012 = 0
-(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
-
-o<reset_all_data> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc
deleted file mode 100644
index f9d400fe..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc
+++ /dev/null
@@ -1,15 +0,0 @@
-o<retractatc> sub
-
-M65 P0 ; Turn off carousel out solenoid
-M64 P1 ; Move Carousel IN
-
-M66 P0 L3 Q5 ; check carousel in position sensor
-o100 if [#5399 LT 0]
-    M65 P1 ; turn off the solenoid to send atc home
-    (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds
-o100 endif
-M65 P1
-
-o<retractatc> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc
deleted file mode 100644
index 33f10b14..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc
+++ /dev/null
@@ -1,103 +0,0 @@
-o<tool_touch_off> sub
-
-; NOTE this routine used G59.3, and this needs to be set to 0,0,0 for everything to work correctly
-
-#<fast_probe_fr> = #1    (set from probe screen fast probe feed rate)
-#<slow_probe_fr> = #2    (set from probe screen slow probe feedrate)
-#<z_max_travel> = #3    (max z distance the tool travels before erroring out if not contact is made)
-#<xy_max_travel> = #4    (max xy distance the tool travels before erroring out if not contact is made)
-#<retract_distance> = #6    (distance the tool retracts after making contact during fast feed mode)
-#<spindle_zero_height> = #5    (G53 distance from home to spindle nose triggering point on touch plate)
-#<tool_diameter_probe_mode> = #8    (activates the tool diameter probe subroutine section)
-#<tool_diameter_offset_mode> = #9    (activates the tool diameter offset position for probe subroutine section)
-#<tool_diameter> = #10    (current tool's diameter used for offseting probe position in x axis)
-
-G92.1    (Cancel G92 offset)
-
-#<workspace_z> = #5220
-
-#<tool_touch_x_coords> = #5181
-#<tool_touch_y_coords> = #5182
-#<tool_touch_z_coords> = #5183
-
-#<tool_radius_offset> = [#<tool_diameter> / 2]
-#<offset_probing_position> = [#<tool_touch_x_coords> - #<tool_radius_offset>]
-
-G59.3
-
-o100 if [#<tool_diameter_offset_mode> EQ 1]
-    #<tool_touch_x_coords> = #<offset_probing_position>
-o100 endif
-
-o110 if [2 EQ 2]
-    G49
-o110 endif
-
-G90    (set absolute coordinates)
-G53 G0 Z0    (move to z0 home position)
-G53 G0 X#<tool_touch_x_coords> Y#<tool_touch_y_coords>
-G53 G0 Z#<tool_touch_z_coords>
-
-G91
-F #<fast_probe_fr>
-G38.2 Z-[#<z_max_travel>]    (fast tool probe)
-#<z_fast_probe> = #5063    (save probe result of fast probe to parameters)
-G0 Z[#<retract_distance>]    (retract tool retract distance amount)
-
-(Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed)
-o120 if [#<slow_probe_fr> GT 0]
-    (Initiate Slow Z- Probe)
-    G91
-    F[#<slow_probe_fr>]    (set probe slow feedrate)
-    G38.2 Z-[#<retract_distance> * 2]    (slow tool probe)
-    #<z_slow_probe> = #5063
-    G90
-    G0 Z[#<z_slow_probe> + #<retract_distance>]
-o120 endif
-
-o130 if [#5070 EQ 1]    (verify probe event was succesful)
-    #<z_slow_probe> = #5063    (save slow probe result to parameters)
-o130 else
-    (MSG,Tool Length Offset Probe Failed)
-o130 endif
-
-(Tool Diameter Probe Mode Section, User must define this section as needed)
-o140 if [#<tool_diameter_probe_mode> EQ 1]
-    (MSG, Tool Diameter Probing is Not Defined in Subroutine)
-o140 endif
-
-o150 if [3 EQ 3]
-    G49
-o150 endif
-
-G90    (set absolute coordinates)
-G53 G0 Z0 (Send Spindle to home zero position)
-
-(define new tool length offset parameters)
-#<new_tool_length_offset> = [ABS[#<spindle_zero_height> + #5063]]
-
-G10 L1 P #5400 Z [#<new_tool_length_offset>]  (5400 = tool number)
-
-o160 if [#<workspace_z> EQ 1]
-    G54
-o160 else if [#<workspace_z> EQ 2]
-    G55
-o160 else if [#<workspace_z> EQ 3]
-    G56
-o160 else if [#<workspace_z> EQ 4]
-    G57
-o160 else if [#<workspace_z> EQ 5]
-    G58
-o160 else if [#<workspace_z> EQ 6]
-    G59
-o160 else if [#<workspace_z> EQ 7]
-    G59.1
-o160 else if [#<workspace_z> EQ 8]
-    G59.2
-o160 endif
-
-T #5400 G43  H #5400    (enable tool length offset)
-
-o<tool_touch_off> endsub
-
-M2 (end program)
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc
deleted file mode 100644
index 31313ce4..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc
+++ /dev/null
@@ -1,130 +0,0 @@
-o<toolchange> sub
-
-; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
-; Parameter #3990 is used to track the current tool pocket (persistently)
-; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
-; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently)
-; Parameter #4000 is not populated just used in the maths to calculate the above numbers
-; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-; #<atc_z_tool_change_height> is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT)
-; #<atc_z_tool_clearance_height> is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT)
-
-(PRINT, o<toolchange> selected_tool: #<selected_tool>, tool_in_spindle: #<tool_in_spindle>, selected_pocket: #<selected_pocket>, current_pocket: #<current_pocket>, task: #<_task>)
-
-o100 if [#<_task> EQ 0]
-    (DEBUG, Task is null)
-    o<toolchange> return [999]
-o100 endif (this code eliminates tool missing error on load for multiple use tools)
-
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
-#<number_of_pockets> = 12
-o101 if [EXISTS[#<_ini[atc]pockets>]]
-    #<number_of_pockets> = #<_ini[atc]pockets>
-o101 endif
-
-#<atc_z_tool_change_height> = -3.9000
-o102 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
-    #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
-o102 endif
-#<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
-o103 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
-    #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
-o103 endif
-
-; assign the variables passed by M6 change_prolog to some parameters
-#100 = #<selected_tool>
-#110 = #<tool_in_spindle>
-#120 = #<selected_pocket>
-#121 = #<current_pocket>
-; NOTE:
-;      The legacy names *selected_pocket* and *current_pocket* actually reference
-;      a sequential tooldata index for tool items loaded from a tool
-;      table ([EMCIO]TOOL_TABLE) or via a tooldata database ([EMCIO]DB_PROGRAM)
-
-o110 if [#<selected_tool> EQ #<tool_in_spindle>] ; checks if tool in the spindle is same as requested
-    o<toolchange> endsub [1]
-    M2
-o110 endif
-
-o111 if [#3991 NE #<tool_in_spindle>]
-    (PRINT, o<toolchange> tool_in_spindle does not match 3991)
-o111 endif
-
-#<next_pocket> = 0 ; assigns 0 to the next pocket for a later check if the tool is found in the carousel
-#<open_pocket> = 0
-#130 = #<number_of_pockets> ; assign test parameter the number of pockets in the carousel
-
-o120 do
-    o121 if [#[4000 + #130] EQ #<selected_tool>] ; checks all pockets to see if it contains tool number requested as the new tool
-        #<next_pocket> = #130 ; if tool is found in pocket, assigns the next pocket
-    o121 endif
-    o122 if [#[4000 + #130] EQ 0] ; checks if the pocket is empty, last pocket checked will be the lowest empty pocket number, for putting tool in spindle away.
-        #<open_pocket> = #130
-    o122 endif
-    #130 = [#130 - 1]
-o120 while [#130 GT 0]
-o130 if [#<next_pocket> EQ 0] ; if tool is not found, aborts and sends a message
-    (abort, Tool T%d#<selected_tool> not found in carousel)
-o130 endif
-
-; now we know which pocket the next tool is sitting in
-; we need to know if we need to put a tool away
-; or if there is not tool in the spindle
-
-o140 if [#<tool_in_spindle> GT 0] ; checks if there is a valid tool in the spindle
-    o141 if [#<open_pocket> EQ 0] ; If there is a tool in the spindle, checks if there is an open pocket
-        (abort, Carousel is full, cant put away tool T#<tool_in_spindle> in into carousel)
-    o141 endif
-    M10 P[#<open_pocket>] ; move carousel to an open pocket
-    M21 ; puts the tool in spindle away into the open pocket
-    (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#<open_pocket>, #<tool_in_spindle>}])
-    #140 = #<open_pocket>
-    #[4000 + #140] = #<tool_in_spindle> ; save tool number in pocket
-    #3991 = 0 ; empty tool in the spindle
-    M61 Q0
-    G49
-o140 endif
-
-G90
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
-
-o150 if [#<selected_tool> GT 0] ; selected tool is not tool0
-    M10 P#<next_pocket> ; set the carousel to move to the right pocket for the selected tool
-    M65 P1
-    M64 P0
-    M66 P1 L3 Q5 ; check carousel out position sensor
-    o151 if [#5399 LT 0]
-        M65 P0 ; turn off the solenoid to send atc to tool change
-        (abort, Failed to send carousel home) ; abort if the    sensor does not activate in 5 seconds
-    o151 endif
-    M65 P0
-
-    (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#<next_pocket>, 0}])
-    M22 ; Carousel out
-    #150 = #<next_pocket>
-    #[4000 + #150] = 0 ; empty the pocket
-    #3991 = #<selected_tool> ; Set persistent variable to remember tool in spindle after power cycle
-o150 else
-    M65 P2 ; deactive drawbar
-    M65 P0 ; make sure ATC out solenoid is off
-    M64 P1 ; move carousel home
-    M66 P0 L3 Q4 ; check carousel in position sensor
-    o152 if [#5399 LT 0]
-        M65 P1 ; turn off the solenoid to send atc home
-        (abort, Failed to send carousel home) ; abort if the    sensor does not activate in 5 seconds
-    o152 endif
-    M65 P1
-o150 endif
-
-M61 Q#<selected_tool>
-
-o160 if [1 EQ 1]
-    G43 H#<selected_tool>
-o160 endif
-
-o<program_coolant> call
-
-(PRINT, o<toolchange> endsub)
-o<toolchange> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc
deleted file mode 100644
index ac9c3798..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc
+++ /dev/null
@@ -1,12 +0,0 @@
-o<unclamptool> sub
-
-M64 P2 ; unclamp the tool
-
-M66 P2 L3 Q2 ; check the unclamped tool sensor
-o100 if [#5399 LT 0]
-    (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds
-o100 endif
-
-o<unclamptool> endsub [1]
-
-M2
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc
deleted file mode 100644
index 39bec9be..00000000
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc
+++ /dev/null
@@ -1,17 +0,0 @@
-o<x_data_reset> sub
-
-#1001 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}])
-
-#1002 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}])
-
-#1005 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}])
-
-#1006 = 0
-(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}])
-
-o<x_data_reset> endsub
-
-M2 (end program)
diff --git a/linuxcnc/nc_files/probe_basic/README.md b/linuxcnc/nc_files/probe_basic/README.md
new file mode 100644
index 00000000..75e22ffa
--- /dev/null
+++ b/linuxcnc/nc_files/probe_basic/README.md
@@ -0,0 +1,34 @@
+# Probe Basic subroutines
+
+This folder contains 4 sub directories with the various subroutines used by Probe Basic, details about each are further below or in the README.md in each.
+
+When installed/updated via apt Probe Basic will install the latests version of the of its subroutines to `/usr/share/probe_basic/nc_files`
+
+These files are also copied to `~/linuxcnc/nc_files`.  How ever it will not overwrite existing files but will add any new files.  
+This ensures that any changes you make to the files at `~/linuxcnc/nc_files` are preserved during updates but new routines will be added. After updates you may wish to compare the difference between the routines at `/usr/share/probe_basic/nc_files` and `~/linuxcnc/nc_files` to see if any change have been made to existing routines.  
+One quick way to view a summary of changes is with `diff` and `diffstat` (this may require `sudo apt-get install -Y diff diffstat`)  
+`diff -u ~/linuxcnc/nc_files/probe_basic /usr/share/probe_basic/nc_files/probe_basic | diffstat`
+
+For a mill your INI `[RS274NGC]SUBROUTINE_PATH` should include `subroutines`, `probe` and `atc_carousel`  
+`SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel`
+
+For a lathe you should include the `lathe` folder as-well at the start  
+`SUBROUTINE_PATH = ../../nc_files/probe_basic/lathe:../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel`
+
+## subroutines
+This folder contains some basic subroutines called from various parts of the UI  
+It does include the tool_touch_off routine that is used with a tool setter
+
+## probe
+This folder contains the probing subroutines that are called form the PROBING tab
+
+## atc_carousel
+This folder contains carousel style ATC subroutines  
+These routines are all called form the ATC tab in the main UI or as part of M6 remap.  
+They automatically support any of the of the sizes currently available (8, 10, 12, 14, 16, 18, 20, 21, 24) based on your INI's `\[ATC\]POCKETS` setting  
+
+If you have an ATC these are the files that you most likely will need to adjust to your needs, see the README.md in the directory for more details
+
+## lathe
+This folder contains lathe subroutines for probe_basic_lathe  
+Some of these are unique to the lathe UI and some are tweaked versions of routines in the other folders that override there normal behaviour
diff --git a/linuxcnc/nc_files/probe_basic/atc_carousel/README.md b/linuxcnc/nc_files/probe_basic/atc_carousel/README.md
new file mode 100644
index 00000000..fd3a8292
--- /dev/null
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/README.md
@@ -0,0 +1,78 @@
+# atc_carousel - Probe Basic Subroutines
+
+https://kcjengr.github.io/probe_basic/atc_setup.html
+
+This folder contains carousel ATC subroutines for `probe_basic`  
+These routines are all called form the ATC tab in the main UI or as part of M6 remap
+
+| File                               | Purpose                                            |
+|------------------------------------|----------------------------------------------------|
+| `clamptool.ngc`                    | Clamp the spindle drawbar                          |
+| `extendatc.ngc`                    | Move the ATC carousel under the spindle            |
+| `m10.ngc`                          | Move tool carousel best direction to pocket P      |
+| `m11.ngc`                          | Move tool carousel CCW P number of pockets         |
+| `m12.ngc`                          | Move tool carousel CW P number of pockets          |
+| `m13.ngc`                          | Move tool carousel CW until homed                  |
+| `m21.ngc`                          | Move Carousel to the tool change position (OUT) then unload any tool in the spindle into the current pocket  |
+| `m22.ngc`                          | Move Carousel to the home position (IN) after loading any tool in the current pocket to the spindle |
+| `m23.ngc`                          | Not currently used                                 |
+| `m24.ngc`                          | Unclamp the spindle drawbar                        |
+| `m25.ngc`                          | Move the ATC carousel under the spindle            |
+| `m26.ngc`                          | Not currently used                                 |
+| `move_head_above_carousel.ngc`     | Move Z to atc_z_tool_clearance_height              |
+| `move_tool_to_carousel_height.ngc` | Move Z to atc_z_tool_change_height                 |
+| `retractatc.ngc`                   | Move the ATC carousel to the home position         |
+| `store_tool_in_carousel.ngc`       | Store spindle tool in carousel                     |
+| `toolchange.ngc`                   | Main M6 toolchange routine                         |
+| `unclamptool.ngc`                  | Unclamp the spindle drawbar                        |
+
+
+Three settings in your INI file set basic configuration of the carousel ATC
+
+```
+[ATC]
+# Carousel image available for 8, 10, 12, 14, 16, 18, 20, 21, 24
+POCKETS = 12
+# The Z height you spindle needs to be at to clamp/unclamp a tool form the ATC
+Z_TOOL_CHANGE_HEIGHT = -3.9000
+# The Z clearance height you spindle needs to be at to safely clear the ATC
+Z_TOOL_CLEARANCE_HEIGHT = -0.1
+
+```
+
+`POCKETS` (defaults to 12) sets `#<number_of_pockets>`
+This is used in most files
+
+
+`Z_TOOL_CHANGE_HEIGHT` (defaults to -3.9000)
+`Z_TOOL_CLEARANCE_HEIGHT` (defaults to [AXIS_Z]MAX_LIMIT>-0.1)
+These two set the heights used in the following files 
+
+* m21
+* m22
+* move_head_above_carousel
+* move_head_above_carousel
+* extendatc
+
+## Hal Connections
+
+![HAL Connections need for ATC](/docs_src/source/images/atc_carousel_connections.png)
+
+## Numbered Parameters
+
+The ATC use several numbered parameters to track the ATC position, tool in the spindle and tools in pockets
+You need to make sure that the the numbers 3990 to 4024 are added to into you `[RS274NGC]PARAMETER_FILE`
+
+| Parameters     | Purpose                                                              |
+|----------------|----------------------------------------------------------------------|
+| #3989          | Used to track if the carousel is homed (M13) (volatile)              |
+| #3990          | Used to track the current tool pocket (persistent)                   |
+| #3991          | Used to track the current tool loaded it in the spindle (persistent) |
+| #4001 to #4024 | Used to track which tool is in which pocket (persistent)             |
+| #4000          | Is just used in the maths to calculate the above numbers (volatile)  |
+
+
+## TODO:
+* add `atc_z_tool_change_height` and `atc_z_tool_clearance_height` to settings UI
+* m21 and m22: call move_tool_to_carousel_height instead of `G53 G0 Z#<atc_z_tool_change_height>`
+* extendatc, m21: call move_head_above_carousel instead of `G53 G0 Z#<atc_z_tool_clearance_height>``
diff --git a/linuxcnc/configs/atc_sim/macros_sim/clamptool.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/clamptool.ngc
similarity index 62%
rename from linuxcnc/configs/atc_sim/macros_sim/clamptool.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/clamptool.ngc
index 8b1a7b1b..d7774ca2 100644
--- a/linuxcnc/configs/atc_sim/macros_sim/clamptool.ngc
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/clamptool.ngc
@@ -4,7 +4,7 @@ M65 P2 ; clamp the tool
 
 M66 P5 L3 Q2 ; check the clamped tool sensor
 o100 if [#5399 LT 0]
-    (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds
+    (abort, Failed to clamp tool) ; abort if the sensor does not activate in 2 seconds
 o100 endif
 
 o<clamptool> endsub [1]
diff --git a/linuxcnc/configs/atc_sim/macros_sim/extendatc.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/extendatc.ngc
similarity index 93%
rename from linuxcnc/configs/atc_sim/macros_sim/extendatc.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/extendatc.ngc
index 95828367..bb632203 100644
--- a/linuxcnc/configs/atc_sim/macros_sim/extendatc.ngc
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/extendatc.ngc
@@ -12,7 +12,7 @@ o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
     #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
 o102 endif
 
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
+G53 G0 Z#<atc_z_tool_clearance_height> ; move z to clear height
 
 M65 P1 ; Turn off carousel home solenoid
 M64 P0 ; Move Carousel OUT
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m10.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m10.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m10.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m10.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m11.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m11.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m11.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m11.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m12.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m12.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m12.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m12.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m13.ngc
similarity index 91%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m13.ngc
index ede03334..dd6cf044 100644
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/m13.ngc
@@ -3,6 +3,7 @@ o<m13> sub
 ; Move tool carousel CW until ATC zero
 ; Parameter #3989 is used to track if the carousel is homed (M13) (volatile)
 ; Parameter #3990 is used to track the current tool pocket (persistently)
+; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
 ; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
 (PRINT, o<m13>)
 
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m21.ngc
similarity index 91%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m21.ngc
index 2ec9daea..2320f8bc 100644
--- a/linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/m21.ngc
@@ -21,7 +21,7 @@ M66 P1 L3 Q1
 
 M5 M9
 G90
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
+G53 G0 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
 
 ;M19 R0 Q3 ; orient spindle
 
@@ -35,7 +35,7 @@ o100 endif
 M24 ; activate drawbar, release the tool
 M5 ; turn off spindle lock
 
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
+G53 G0 Z#<atc_z_tool_clearance_height> ; move z to clear height
 
 #3991 = 0; save fact there is now no tool in the spindle
 
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m22.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m22.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m22.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m22.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m23.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m23.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m23.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m23.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m24.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m24.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m24.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m24.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m25.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m25.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m25.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m25.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m26.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m26.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m26.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/m26.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/move_head_above_carousel.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/move_head_above_carousel.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/move_head_above_carousel.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/move_head_above_carousel.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/move_tool_to_carousel_height.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/move_tool_to_carousel_height.ngc
similarity index 92%
rename from linuxcnc/configs/atc_sim/macros_sim/move_tool_to_carousel_height.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/move_tool_to_carousel_height.ngc
index 77215115..b2c7f441 100644
--- a/linuxcnc/configs/atc_sim/macros_sim/move_tool_to_carousel_height.ngc
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/move_tool_to_carousel_height.ngc
@@ -11,7 +11,7 @@ o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
     #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
 o102 endif
 
-G0 G53 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
+G53 G0 Z#<atc_z_tool_change_height> ; rapid move to above the tool change height
 
 o<move_tool_to_carousel_height> endsub [1]
 
diff --git a/linuxcnc/configs/atc_sim/macros_sim/retractatc.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/retractatc.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/retractatc.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/retractatc.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/store_tool_in_carousel.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/store_tool_in_carousel.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/store_tool_in_carousel.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/store_tool_in_carousel.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/toolchange.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/toolchange.ngc
similarity index 97%
rename from linuxcnc/configs/atc_sim/macros_sim/toolchange.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/toolchange.ngc
index 31313ce4..3d89ab8a 100644
--- a/linuxcnc/configs/atc_sim/macros_sim/toolchange.ngc
+++ b/linuxcnc/nc_files/probe_basic/atc_carousel/toolchange.ngc
@@ -86,7 +86,7 @@ o140 if [#<tool_in_spindle> GT 0] ; checks if there is a valid tool in the spind
 o140 endif
 
 G90
-G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
+G53 G0 Z#<atc_z_tool_clearance_height> ; move z to clear height
 
 o150 if [#<selected_tool> GT 0] ; selected tool is not tool0
     M10 P#<next_pocket> ; set the carousel to move to the right pocket for the selected tool
@@ -108,7 +108,7 @@ o150 else
     M65 P2 ; deactive drawbar
     M65 P0 ; make sure ATC out solenoid is off
     M64 P1 ; move carousel home
-    M66 P0 L3 Q4 ; check carousel in position sensor
+    M66 P0 L3 Q5 ; check carousel in position sensor
     o152 if [#5399 LT 0]
         M65 P1 ; turn off the solenoid to send atc home
         (abort, Failed to send carousel home) ; abort if the    sensor does not activate in 5 seconds
diff --git a/linuxcnc/configs/atc_sim/macros_sim/unclamptool.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/unclamptool.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/unclamptool.ngc
rename to linuxcnc/nc_files/probe_basic/atc_carousel/unclamptool.ngc
diff --git a/linuxcnc/nc_files/probe_basic/lathe/README.md b/linuxcnc/nc_files/probe_basic/lathe/README.md
new file mode 100644
index 00000000..1d583ae1
--- /dev/null
+++ b/linuxcnc/nc_files/probe_basic/lathe/README.md
@@ -0,0 +1,4 @@
+# lathe - Probe Basic Subroutines
+
+This folder contains lathe subroutines for `probe_basic_lathe`  
+Some are unique to the lathe ui and some are tweaked version to override existing routines
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/backup_restore.ngc b/linuxcnc/nc_files/probe_basic/lathe/backup_restore.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/backup_restore.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/backup_restore.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/backup_status.ngc b/linuxcnc/nc_files/probe_basic/lathe/backup_status.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/backup_status.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/backup_status.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/chamfer.ngc b/linuxcnc/nc_files/probe_basic/lathe/chamfer.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/chamfer.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/chamfer.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/drill.ngc b/linuxcnc/nc_files/probe_basic/lathe/drill.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/drill.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/drill.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/facing.ngc b/linuxcnc/nc_files/probe_basic/lathe/facing.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/facing.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/facing.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/go_to_g30.ngc b/linuxcnc/nc_files/probe_basic/lathe/go_to_g30.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/go_to_g30.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/go_to_g30.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/go_to_home.ngc b/linuxcnc/nc_files/probe_basic/lathe/go_to_home.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/go_to_home.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/go_to_home.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/go_to_zero.ngc b/linuxcnc/nc_files/probe_basic/lathe/go_to_zero.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/go_to_zero.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/go_to_zero.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_main_panel.ngc b/linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_main_panel.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_main_panel.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_main_panel.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_touch_panel.ngc b/linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_touch_panel.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_touch_panel.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_touch_panel.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_minus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_minus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_minus_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_plus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_plus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_plus_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_minus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_minus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_minus_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_plus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_plus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_plus_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_back_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_back_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_back_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_back_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_front_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_front_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_front_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_front_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_left_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_left_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_left_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_left_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_right_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_right_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_right_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_right_edge_angle.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/radius.ngc b/linuxcnc/nc_files/probe_basic/lathe/radius.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/radius.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/radius.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/set_g30_position.ngc b/linuxcnc/nc_files/probe_basic/lathe/set_g30_position.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/set_g30_position.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/set_g30_position.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_x_sub.ngc b/linuxcnc/nc_files/probe_basic/lathe/set_mt_x_sub.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_x_sub.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/set_mt_x_sub.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_z_sub.ngc b/linuxcnc/nc_files/probe_basic/lathe/set_mt_z_sub.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_z_sub.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/set_mt_z_sub.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/tapping.ngc b/linuxcnc/nc_files/probe_basic/lathe/tapping.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/tapping.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/tapping.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/threading.ngc b/linuxcnc/nc_files/probe_basic/lathe/threading.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/threading.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/threading.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_x.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_off_x.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_x.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/touch_off_x.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_z.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_off_z.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_z.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/touch_off_z.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_x.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_x.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_x.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/touch_x.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_z.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_z.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_z.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/touch_z.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/x_data_reset.ngc b/linuxcnc/nc_files/probe_basic/lathe/x_data_reset.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/x_data_reset.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/x_data_reset.ngc
diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/z_data_reset.ngc b/linuxcnc/nc_files/probe_basic/lathe/z_data_reset.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic_lathe/subroutines/z_data_reset.ngc
rename to linuxcnc/nc_files/probe_basic/lathe/z_data_reset.ngc
diff --git a/linuxcnc/nc_files/probe_basic/probe/README.md b/linuxcnc/nc_files/probe_basic/probe/README.md
new file mode 100644
index 00000000..c3e4db6c
--- /dev/null
+++ b/linuxcnc/nc_files/probe_basic/probe/README.md
@@ -0,0 +1,4 @@
+# probe - Probe Basic Subroutines
+
+This folder contains probing subroutines for `probe_basic`  
+These routines are all called form the PROBE tab in the main UI
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_back_left_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_left_inside_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_back_left_inside_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_back_left_inside_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_back_left_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_left_top_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_back_left_top_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_back_left_top_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_back_right_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_right_inside_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_back_right_inside_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_back_right_inside_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_back_right_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_right_top_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_back_right_top_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_back_right_top_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_back_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_top_side.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_back_top_side.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_back_top_side.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_cal_reset.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_reset.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_cal_reset.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_reset.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_cal_round_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_round_boss.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_cal_round_boss.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_round_boss.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_cal_round_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_round_pocket.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_cal_round_pocket.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_round_pocket.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_cal_square_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_square_boss.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_cal_square_boss.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_square_boss.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_cal_square_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_square_pocket.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_cal_square_pocket.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_square_pocket.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_x_minus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_corner_x_minus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_x_minus_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_x_plus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_corner_x_plus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_x_plus_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_y_minus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_corner_y_minus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_y_minus_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_y_plus_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_corner_y_plus_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_y_plus_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_front_left_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_left_inside_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_front_left_inside_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_front_left_inside_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_front_left_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_left_top_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_front_left_top_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_front_left_top_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_front_right_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_right_inside_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_front_right_inside_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_front_right_inside_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_front_right_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_right_top_corner.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_front_right_top_corner.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_front_right_top_corner.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_front_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_top_side.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_front_top_side.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_front_top_side.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_left_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_left_top_side.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_left_top_side.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_left_top_side.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_rect_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_rect_boss.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_rect_boss.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_rect_boss.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_rect_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_rect_pocket.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_rect_pocket_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket_center_start.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_rect_pocket_center_start.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket_center_start.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_ridge_x.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_ridge_x.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_ridge_x.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_ridge_x.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_ridge_y.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_ridge_y.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_ridge_y.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_ridge_y.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_right_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_right_top_side.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_right_top_side.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_right_top_side.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_round_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_round_boss.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_round_boss.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_round_boss.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_round_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_round_pocket.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_round_pocket.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_round_pocket.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_round_pocket_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_round_pocket_center_start.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_round_pocket_center_start.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_round_pocket_center_start.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_top_back_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_back_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_top_back_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_top_back_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_top_front_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_front_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_top_front_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_top_front_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_top_left_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_left_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_top_left_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_top_left_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_top_right_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_right_edge_angle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_top_right_edge_angle.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_top_right_edge_angle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_valley_x.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_x.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_valley_x.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_x.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_valley_x_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_x_center_start.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_valley_x_center_start.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_x_center_start.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_valley_y.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_y.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_valley_y.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_y.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_valley_y_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_y_center_start.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_valley_y_center_start.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_y_center_start.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_x_minus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_minus.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_x_minus.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_x_minus.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_x_minus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_minus_wco.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_x_minus_wco.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_x_minus_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_x_plus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_plus.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_x_plus.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_x_plus.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_x_plus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_plus_wco.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_x_plus_wco.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_x_plus_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_y_minus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_minus.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_y_minus.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_y_minus.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_y_minus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_minus_wco.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_y_minus_wco.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_y_minus_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_y_plus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_plus.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_y_plus.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_y_plus.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_y_plus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_plus_wco.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_y_plus_wco.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_y_plus_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_z_minus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_z_minus.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_z_minus.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_z_minus.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_z_minus_sub.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_z_minus_sub.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_z_minus_sub.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_z_minus_sub.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/probe_z_minus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_z_minus_wco.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/probe_z_minus_wco.ngc
rename to linuxcnc/nc_files/probe_basic/probe/probe_z_minus_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/reset_all_data.ngc b/linuxcnc/nc_files/probe_basic/probe/reset_all_data.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/reset_all_data.ngc
rename to linuxcnc/nc_files/probe_basic/probe/reset_all_data.ngc
diff --git a/linuxcnc/configs/probe_basic/subroutines/x_data_reset.ngc b/linuxcnc/nc_files/probe_basic/probe/x_data_reset.ngc
similarity index 100%
rename from linuxcnc/configs/probe_basic/subroutines/x_data_reset.ngc
rename to linuxcnc/nc_files/probe_basic/probe/x_data_reset.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/y_data_reset.ngc b/linuxcnc/nc_files/probe_basic/probe/y_data_reset.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/y_data_reset.ngc
rename to linuxcnc/nc_files/probe_basic/probe/y_data_reset.ngc
diff --git a/linuxcnc/nc_files/probe_basic/subroutines/README.md b/linuxcnc/nc_files/probe_basic/subroutines/README.md
new file mode 100644
index 00000000..20c638e4
--- /dev/null
+++ b/linuxcnc/nc_files/probe_basic/subroutines/README.md
@@ -0,0 +1,3 @@
+# subroutines - Probe Basic Subroutines
+
+This folder contains basic subroutines for `probe_basic`  
diff --git a/linuxcnc/configs/atc_sim/macros_sim/go_to_g30.ngc b/linuxcnc/nc_files/probe_basic/subroutines/go_to_g30.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/go_to_g30.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/go_to_g30.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/go_to_home.ngc b/linuxcnc/nc_files/probe_basic/subroutines/go_to_home.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/go_to_home.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/go_to_home.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/go_to_zero.ngc b/linuxcnc/nc_files/probe_basic/subroutines/go_to_zero.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/go_to_zero.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/go_to_zero.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/load_spindle_safety.ngc b/linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/load_spindle_safety.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/load_spindle_safety_2.ngc b/linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety_2.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/load_spindle_safety_2.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety_2.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m6_tool_call_atc_page.ngc b/linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_atc_page.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m6_tool_call_atc_page.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_atc_page.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m6_tool_call_main_panel.ngc b/linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_main_panel.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m6_tool_call_main_panel.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_main_panel.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m6_tool_call_tool_page.ngc b/linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_tool_page.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/m6_tool_call_tool_page.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_tool_page.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/on_abort.ngc b/linuxcnc/nc_files/probe_basic/subroutines/on_abort.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/on_abort.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/on_abort.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/orientspindle.ngc b/linuxcnc/nc_files/probe_basic/subroutines/orientspindle.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/orientspindle.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/orientspindle.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/program_coolant.ngc b/linuxcnc/nc_files/probe_basic/subroutines/program_coolant.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/program_coolant.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/program_coolant.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/set_g30_position.ngc b/linuxcnc/nc_files/probe_basic/subroutines/set_g30_position.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/set_g30_position.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/set_g30_position.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/tool_touch_off.ngc b/linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/tool_touch_off.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/tool_touch_off_entire_carousel.ngc b/linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc
similarity index 100%
rename from linuxcnc/configs/atc_sim/macros_sim/tool_touch_off_entire_carousel.ngc
rename to linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc