diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 283bac1b..f6ee75c6 100755
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -289,24 +289,10 @@
 
 #if ANY(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
   #define FIL_RUNOUT_PIN 33
-  #ifndef Z2_STEP_PIN 
-    #define Z2_STEP_PIN                         46
-  #endif
-  #ifndef Z2_DIR_PIN
-      #define Z2_DIR_PIN                        48
-  #endif
-  #ifndef Z2_ENABLE_PIN
-      #define Z2_ENABLE_PIN                     62
-  #endif
-  #ifndef Z2_CS_PIN
-      #define Z2_CS_PIN                         40
-  #endif
 #else
   #define FIL_RUNOUT_PIN 19
 #endif
 
-
-
 #ifndef PS_ON_PIN
   #define PS_ON_PIN                           12
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h b/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
index 448e689c..c3561808 100755
--- a/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
@@ -142,19 +142,6 @@
   #define Z_CS_PIN                            40
 #endif
 
-#ifndef Z2_STEP_PIN 
-    #define Z2_STEP_PIN                       46
-#endif
-#ifndef Z2_DIR_PIN
-    #define Z2_DIR_PIN                        48
-#endif
-#ifndef Z2_ENABLE_PIN
-    #define Z2_ENABLE_PIN                     62
-#endif
-#ifndef Z2_CS_PIN
-    #define Z2_CS_PIN                         40
-#endif
-
 #define E0_STEP_PIN                           26
 #define E0_DIR_PIN                            28
 #define E0_ENABLE_PIN                         24
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 45614ae5..9bd09926 100755
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -103,7 +103,7 @@
     #endif
   #endif
 
-  #if ANY(TRIGORILLA_MAPPING_CHIRON, SWAP_Z_MOTORS, KNUTWURST_CHIRON, KNUTWURST_4MAXP2) // PATCH: knutwurst
+  #if EITHER(TRIGORILLA_MAPPING_CHIRON, SWAP_Z_MOTORS)
     // Chiron and some Anycubic i3 MEGAs swap Z steppers
     #define Z_STEP_PIN                        36
     #define Z_DIR_PIN                         34