diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index d3a8bda629..5bf3c00e98 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -22,10 +22,6 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(Z_STEPPER_AUTO_ALIGN)
-
-#include "../../feature/z_stepper_align.h"
-
 #include "../gcode.h"
 #include "../../module/planner.h"
 #include "../../module/stepper.h"
@@ -55,7 +51,6 @@
 
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
 
-
 #include "../../feature/z_stepper_align.h"
 
 #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 662bc2b72d..f2bd81e670 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -327,7 +327,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 33: G33(); break;                                    // G33: Delta Auto-Calibration
       #endif
 
-      #if ANY(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
+      #if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
         case 34: G34(); break;                                    // G34: Z Stepper automatic alignment using probe
       #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 90628299c1..3d745eff89 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -465,7 +465,7 @@ private:
 
   TERN_(DELTA_AUTO_CALIBRATION, static void G33());
 
-  #if ANY(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
+  #if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
     static void G34();
   #endif
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 51fc40860b..33e5c351ab 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2816,17 +2816,6 @@ void MarlinSettings::reset() {
     DEBUG_ECHOLNPGM("Digipot Written");
   #endif
 
-  //
-  // DIGIPOTS
-  //
-  #if HAS_MOTOR_CURRENT_SPI
-    static constexpr uint32_t tmp_motor_current_setting[] = DIGIPOT_MOTOR_CURRENT;
-    DEBUG_ECHOLNPGM("Writing Digipot");
-    LOOP_L_N(q, COUNT(tmp_motor_current_setting))
-      stepper.set_digipot_current(q, tmp_motor_current_setting[q]);
-    DEBUG_ECHOLNPGM("Digipot Written");
-  #endif
-
   //
   // CNC Coordinate System
   //
diff --git a/platformio.ini b/platformio.ini
index 9d3fafd69e..9e77c3b057 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -309,7 +309,7 @@ MK2_MULTIPLEXER         = src_filter=+<src/feature/snmm.cpp>
 EXT_SOLENOID|MANUAL_SOLENOID_CONTROL = src_filter=+<src/feature/solenoid.cpp> +<src/gcode/control/M380_M381.cpp>
 HAS_CUTTER              = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
 EXPERIMENTAL_I2CBUS     = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
-Z_STEPPER_AUTO_ALIGN    = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
+Z_STEPPER_AUTO_ALIGN|MECHANICAL_GANTRY_CALIBRATION = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
 G26_MESH_VALIDATION     = src_filter=+<src/gcode/bedlevel/G26.cpp>
 ASSISTED_TRAMMING       = src_filter=+<src/gcode/bedlevel/G35.cpp>
 HAS_MESH                = src_filter=+<src/gcode/bedlevel/G42.cpp>