diff --git a/calibration/calibration_macros.cfg b/calibration/calibration_macros.cfg
index 84873a0..0b82754 100644
--- a/calibration/calibration_macros.cfg
+++ b/calibration/calibration_macros.cfg
@@ -16,16 +16,26 @@ gcode:
     RESPOND MSG="   NEPTUNE 4 PLUS CALIBRATION SUITE"
     RESPOND MSG="=============================================="
     RESPOND MSG=""
-    RESPOND MSG="Available calibrations:"
-    RESPOND MSG="  1. CALIBRATE_Z_OFFSET          - Z0 with Cartographer"
-    RESPOND MSG="  2. CALIBRATE_INPUT_SHAPER      - ADXL resonance"
-    RESPOND MSG="  3. CALIBRATE_PRESSURE_ADVANCE  - PA tuning"
-    RESPOND MSG="  4. CALIBRATE_FLOW_RATE         - Flow calibration"
-    RESPOND MSG="  5. CALIBRATE_TEMPERATURE       - Temp tower"
-    RESPOND MSG="  6. CALIBRATE_RETRACTION        - Retraction test"
-    RESPOND MSG="  7. CALIBRATE_BED_MESH          - Mesh verification"
+    RESPOND MSG="Run these macros INDIVIDUALLY (in order):"
     RESPOND MSG=""
-    RESPOND MSG="Full suite: CALIBRATION_FULL"
+    RESPOND MSG="SETUP (do once):"
+    RESPOND MSG="  CALIBRATE_Z_OFFSET          - Z0 with Cartographer (MANUAL!)"
+    RESPOND MSG="  CALIBRATE_INPUT_SHAPER      - ADXL resonance (if ADXL connected)"
+    RESPOND MSG=""
+    RESPOND MSG="FILAMENT-SPECIFIC (per filament):"
+    RESPOND MSG="  CALIBRATE_PRESSURE_ADVANCE  - PA tuning (inspect squares)"
+    RESPOND MSG="  CALIBRATE_FLOW_RATE         - Flow calibration (measure)"
+    RESPOND MSG="  CALIBRATE_TEMPERATURE       - Temp tower (inspect)"
+    RESPOND MSG="  CALIBRATE_RETRACTION        - Retraction test (inspect)"
+    RESPOND MSG=""
+    RESPOND MSG="PERIODIC:"
+    RESPOND MSG="  CALIBRATE_BED_MESH          - Mesh verification"
+    RESPOND MSG=""
+    RESPOND MSG="⚠️  IMPORTANT:"
+    RESPOND MSG="  - Each macro must be run individually"
+    RESPOND MSG="  - Some require manual interaction (Z-Offset)"
+    RESPOND MSG="  - Some require visual inspection (PA, Temp, Retract)"
+    RESPOND MSG="  - Run SAVE_CONFIG after Z-Offset and Input Shaper"
     RESPOND MSG="=============================================="
 
 # ----------------------------------------------------------------------------
@@ -331,92 +341,29 @@ gcode:
     RESPOND MSG="Run SAVE_CONFIG to make permanent"
 
 # ----------------------------------------------------------------------------
-# FULL CALIBRATION SUITE - Runs all calibrations in sequence
+# ⚠️ CALIBRATION_FULL / CALIBRATION_QUICK REMOVED
 # ----------------------------------------------------------------------------
-[gcode_macro CALIBRATION_FULL]
-description: Run complete calibration suite (takes ~2.5 hours)
-gcode:
-    RESPOND MSG="=============================================="
-    RESPOND MSG="   STARTING FULL CALIBRATION SUITE"
-    RESPOND MSG="   Estimated time: ~2.5 hours"
-    RESPOND MSG="=============================================="
-    RESPOND MSG=""
-    RESPOND MSG="This will run ALL calibrations in sequence."
-    RESPOND MSG="You can stop at any time with emergency stop."
-    RESPOND MSG=""
-    RESPOND MSG="Starting in 5 seconds..."
-    G4 P5000
-    
-    # 1. Z-Offset
-    RESPOND MSG=">>> Starting Z-Offset Calibration..."
-    CALIBRATE_Z_OFFSET
-    G4 P2000
-    
-    # 2. Input Shaper
-    RESPOND MSG=">>> Starting Input Shaper Calibration..."
-    CALIBRATE_INPUT_SHAPER
-    G4 P2000
-    
-    # 3. Pressure Advance
-    RESPOND MSG=">>> Starting Pressure Advance Calibration..."
-    CALIBRATE_PRESSURE_ADVANCE FILAMENT=PLA
-    G4 P2000
-    
-    # 4. Flow Rate
-    RESPOND MSG=">>> Starting Flow Rate Calibration..."
-    CALIBRATE_FLOW_RATE FILAMENT=PLA
-    G4 P2000
-    
-    # 5. Temperature Tower
-    RESPOND MSG=">>> Starting Temperature Tower..."
-    CALIBRATE_TEMPERATURE FILAMENT=PLA
-    G4 P2000
-    
-    # 6. Retraction Test
-    RESPOND MSG=">>> Starting Retraction Test..."
-    CALIBRATE_RETRACTION FILAMENT=PLA
-    G4 P2000
-    
-    # 7. Bed Mesh
-    RESPOND MSG=">>> Starting Bed Mesh Calibration..."
-    CALIBRATE_BED_MESH
-    
-    RESPOND MSG=""
-    RESPOND MSG="=============================================="
-    RESPOND MSG="   FULL CALIBRATION SUITE COMPLETE!"
-    RESPOND MSG="=============================================="
-    RESPOND MSG=""
-    RESPOND MSG="IMPORTANT: Run SAVE_CONFIG now to save all settings!"
-    RESPOND MSG=""
-
+# These macros were removed because they don't work correctly:
+#
+# - CALIBRATE_Z_OFFSET requires manual interaction (TESTZ/ACCEPT)
+# - PA_TEST_PATTERN requires visual inspection
+# - TEMP_TOWER requires visual inspection
+# - RETRACT_TEST requires visual inspection
+#
+# Running these automatically without user input produces bad results!
+#
+# ✅ CORRECT WORKFLOW:
+# Run calibration macros INDIVIDUALLY from the menu:
+#   1. CALIBRATE_Z_OFFSET          - Do manually with paper test
+#   2. CALIBRATE_INPUT_SHAPER      - Automatic (if ADXL connected)
+#   3. CALIBRATE_PRESSURE_ADVANCE  - Inspect test pattern
+#   4. CALIBRATE_FLOW_RATE         - Measure with calipers
+#   5. CALIBRATE_TEMPERATURE       - Inspect temp tower
+#   6. CALIBRATE_RETRACTION        - Inspect stringing towers
+#   7. CALIBRATE_BED_MESH          - Automatic
+#
+# After each calibration that changes settings: SAVE_CONFIG
 # ----------------------------------------------------------------------------
-# QUICK CALIBRATION - Essential calibrations only (~30 min)
-# ----------------------------------------------------------------------------
-[gcode_macro CALIBRATION_QUICK]
-description: Run quick calibration (Z-offset + PA + Bed Mesh, ~30 min)
-gcode:
-    RESPOND MSG="=============================================="
-    RESPOND MSG="   STARTING QUICK CALIBRATION"
-    RESPOND MSG="   Estimated time: ~30 minutes"
-    RESPOND MSG="=============================================="
-    RESPOND MSG=""
-    
-    # 1. Z-Offset
-    RESPOND MSG=">>> Z-Offset Calibration..."
-    CALIBRATE_Z_OFFSET
-    G4 P2000
-    
-    # 2. Pressure Advance
-    RESPOND MSG=">>> Pressure Advance Calibration..."
-    CALIBRATE_PRESSURE_ADVANCE FILAMENT=PLA
-    G4 P2000
-    
-    # 3. Bed Mesh
-    RESPOND MSG=">>> Bed Mesh Calibration..."
-    CALIBRATE_BED_MESH
-    
-    RESPOND MSG=""
-    RESPOND MSG="=============================================="
     RESPOND MSG="   QUICK CALIBRATION COMPLETE!"
     RESPOND MSG="=============================================="
     RESPOND MSG=""