diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 136f92dda2..d93ace405f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1,9 +1,9 @@
-#define ABL_BLTOUCH // Replaces RGB LED
+//#define ABL_BLTOUCH // Replaces RGB LED
 #define GraphicalLCD // Will work next to MKS TFT
-#define TMC_2209 // Defaults to TMC2100
-#define ABL_UBL // Defaults to Bilinear
+//#define TMC_2209 // Defaults to TMC2100
+//#define ABL_UBL // Defaults to Bilinear
 //#define RunoutSensor // Tinymachines Lerdge Sensor
-#define RELOCATE_LED // Since the bltouch by default removed the LED, set this if you simply moved them off the hotend
+//#define RELOCATE_LED // Since the bltouch by default removed the LED, set this if you simply moved them off the hotend
 
 /**
  * Marlin 3D Printer Firmware
@@ -989,7 +989,9 @@
 #define Z_PROBE_OFFSET_RANGE_MAX 20
 
 // Enable the M48 repeatability test to test probe accuracy
-#define Z_MIN_PROBE_REPEATABILITY_TEST
+#if ENABLED(ABL_BLTOUCH)
+  #define Z_MIN_PROBE_REPEATABILITY_TEST
+#endif
 
 // Before deploy/stow pause for user confirmation
 //#define PAUSE_BEFORE_DEPLOY_STOW
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 41dfc36e8b..897ab66824 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -598,7 +598,9 @@
  * Z Steppers Auto-Alignment
  * Add the G34 command to align multiple Z steppers using a bed probe.
  */
-#define Z_STEPPER_AUTO_ALIGN
+#if ENABLED(ABL_BLTOUCH)
+  #define Z_STEPPER_AUTO_ALIGN
+#endif
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
   // Define probe X and Y positions for Z1, Z2 [, Z3]
   #define Z_STEPPER_ALIGN_X { 30, 270 }
@@ -1190,7 +1192,9 @@
 
   //#define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
 
-  #define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
+  #if ENABLED(ABL_BLTOUCH)
+    #define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
+  #endif
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets
     #if ENABLED(GraphicalLCD)
diff --git a/Marlin/src/pins/ramps/PINS_SIDEWINDERX1.h b/Marlin/src/pins/ramps/PINS_SIDEWINDERX1.h
index 775bd11d6f..e408a3f7d5 100644
--- a/Marlin/src/pins/ramps/PINS_SIDEWINDERX1.h
+++ b/Marlin/src/pins/ramps/PINS_SIDEWINDERX1.h
@@ -50,10 +50,10 @@
   #define Y_CS_PIN 63
 #endif
 
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          19
-#define Z_MAX_PIN          18
+//#define Y_MIN_PIN          14
+//#define Y_MAX_PIN          15
+//#define Z_MIN_PIN          19
+//#define Z_MAX_PIN          18
 
 #if EITHER(RGB_LED, RGBW_LED)
   #define RGB_LED_R_PIN 5
diff --git a/Marlin/src/pins/ramps/pins_SIDEWINDER_X1.h b/Marlin/src/pins/ramps/pins_SIDEWINDER_X1.h
index 775bd11d6f..e408a3f7d5 100644
--- a/Marlin/src/pins/ramps/pins_SIDEWINDER_X1.h
+++ b/Marlin/src/pins/ramps/pins_SIDEWINDER_X1.h
@@ -50,10 +50,10 @@
   #define Y_CS_PIN 63
 #endif
 
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          19
-#define Z_MAX_PIN          18
+//#define Y_MIN_PIN          14
+//#define Y_MAX_PIN          15
+//#define Z_MIN_PIN          19
+//#define Z_MAX_PIN          18
 
 #if EITHER(RGB_LED, RGBW_LED)
   #define RGB_LED_R_PIN 5