diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py
index 3d817d72..2bcb9cc1 100644
--- a/klippy/extras/bltouch.py
+++ b/klippy/extras/bltouch.py
@@ -64,7 +64,11 @@ class BLTouchProbe:
         self.cmd_helper = probe.ProbeCommandHelper(
             config, self, self.mcu_endstop.query_endstop)
         self.probe_offsets = probe.ProbeOffsetsHelper(config)
-        self.probe_session = probe.ProbeEndstopSessionHelper(config, self)
+        self.param_helper = probe.ProbeParameterHelper(config)
+        self.homing_helper = probe.HomingViaProbeHelper(config, self,
+                                                        self.param_helper)
+        self.probe_session = probe.ProbeSessionHelper(
+            config, self.param_helper, self.homing_helper.start_probe_session)
         # Register BLTOUCH_DEBUG command
         self.gcode = self.printer.lookup_object('gcode')
         self.gcode.register_command("BLTOUCH_DEBUG", self.cmd_BLTOUCH_DEBUG,
@@ -75,7 +79,7 @@ class BLTouchProbe:
         self.printer.register_event_handler("klippy:connect",
                                             self.handle_connect)
     def get_probe_params(self, gcmd=None):
-        return self.probe_session.get_probe_params(gcmd)
+        return self.param_helper.get_probe_params(gcmd)
     def get_offsets(self):
         return self.probe_offsets.get_offsets()
     def get_status(self, eventtime):
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py
index 7118e8ac..c919b983 100644
--- a/klippy/extras/probe.py
+++ b/klippy/extras/probe.py
@@ -393,18 +393,6 @@ class ProbeSessionHelper:
         self.results = []
         return res
 
-# Helper for probes based purely on an endstop wrapper
-class ProbeEndstopSessionHelper:
-    def __init__(self, config, mcu_probe):
-        self.param_helper = ProbeParameterHelper(config)
-        self.homing_helper = HomingViaProbeHelper(config, mcu_probe,
-                                                  self.param_helper)
-        self.probe_session = ProbeSessionHelper(
-            config, self.param_helper, self.homing_helper.start_probe_session)
-        # Main printer probe session starting API
-        self.start_probe_session = self.probe_session.start_probe_session
-        self.get_probe_params = self.param_helper.get_probe_params
-
 # Helper to read the xyz probe offsets from the config
 class ProbeOffsetsHelper:
     def __init__(self, config):
@@ -606,9 +594,13 @@ class PrinterProbe:
         self.cmd_helper = ProbeCommandHelper(config, self,
                                              self.mcu_probe.query_endstop)
         self.probe_offsets = ProbeOffsetsHelper(config)
-        self.probe_session = ProbeEndstopSessionHelper(config, self.mcu_probe)
+        self.param_helper = ProbeParameterHelper(config)
+        self.homing_helper = HomingViaProbeHelper(config, self.mcu_probe,
+                                                  self.param_helper)
+        self.probe_session = ProbeSessionHelper(
+            config, self.param_helper, self.homing_helper.start_probe_session)
     def get_probe_params(self, gcmd=None):
-        return self.probe_session.get_probe_params(gcmd)
+        return self.param_helper.get_probe_params(gcmd)
     def get_offsets(self):
         return self.probe_offsets.get_offsets()
     def get_status(self, eventtime):
diff --git a/klippy/extras/smart_effector.py b/klippy/extras/smart_effector.py
index 963d9fa5..4b90c309 100644
--- a/klippy/extras/smart_effector.py
+++ b/klippy/extras/smart_effector.py
@@ -69,7 +69,11 @@ class SmartEffectorProbe:
         self.cmd_helper = probe.ProbeCommandHelper(
             config, self, self.probe_wrapper.query_endstop)
         self.probe_offsets = probe.ProbeOffsetsHelper(config)
-        self.probe_session = probe.ProbeEndstopSessionHelper(config, self)
+        self.param_helper = probe.ProbeParameterHelper(config)
+        self.homing_helper = probe.HomingViaProbeHelper(config, self,
+                                                        self.param_helper)
+        self.probe_session = probe.ProbeSessionHelper(
+            config, self.param_helper, self.homing_helper.start_probe_session)
         # SmartEffector control
         control_pin = config.get('control_pin', None)
         if control_pin:
@@ -85,7 +89,7 @@ class SmartEffectorProbe:
                                     self.cmd_SET_SMART_EFFECTOR,
                                     desc=self.cmd_SET_SMART_EFFECTOR_help)
     def get_probe_params(self, gcmd=None):
-        return self.probe_session.get_probe_params(gcmd)
+        return self.param_helper.get_probe_params(gcmd)
     def get_offsets(self):
         return self.probe_offsets.get_offsets()
     def get_status(self, eventtime):