diff --git a/calibration/calibration_macros.cfg b/calibration/calibration_macros.cfg
index 5c1a9ff..1073d30 100644
--- a/calibration/calibration_macros.cfg
+++ b/calibration/calibration_macros.cfg
@@ -11,7 +11,6 @@
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATION_MENU]
 description: Show calibration menu with all options
-group: Calibration
 gcode:
     RESPOND MSG="=============================================="
     RESPOND MSG="   NEPTUNE 4 PLUS CALIBRATION SUITE"
@@ -34,7 +33,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_Z_OFFSET]
 description: Calibrate Z-offset using Cartographer touch
-group: Calibration
 gcode:
     RESPOND MSG="Starting Z-Offset Calibration..."
     RESPOND MSG=""
@@ -64,7 +62,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_INPUT_SHAPER]
 description: Measure resonance frequencies with ADXL345
-group: Calibration
 gcode:
     RESPOND MSG="Starting Input Shaper Calibration..."
     RESPOND MSG=""
@@ -87,7 +84,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_PRESSURE_ADVANCE]
 description: Calibrate Pressure Advance for optimal corners
-group: Calibration
 gcode:
     {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
     {% set START_PA = params.START|default(0.01)|float %}
@@ -143,7 +139,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_FLOW_RATE]
 description: Calibrate flow rate for exact wall dimensions
-group: Calibration
 gcode:
     {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
     
@@ -195,7 +190,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_TEMPERATURE]
 description: Print temperature tower to find optimal temp
-group: Calibration
 gcode:
     {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
     {% set START_TEMP = params.START|default(195)|int %}
@@ -240,7 +234,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_RETRACTION]
 description: Test retraction settings to minimize stringing
-group: Calibration
 gcode:
     {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
     {% set HOTEND = params.HOTEND|default("ORIGINAL")|upper %}
@@ -303,7 +296,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATE_BED_MESH]
 description: Calibrate bed mesh with Cartographer
-group: Calibration
 gcode:
     RESPOND MSG="Starting Bed Mesh Calibration..."
     RESPOND MSG=""
@@ -330,7 +322,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATION_FULL]
 description: Run complete calibration suite (takes ~2.5 hours)
-group: Calibration
 gcode:
     RESPOND MSG="=============================================="
     RESPOND MSG="   STARTING FULL CALIBRATION SUITE"
@@ -390,7 +381,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro CALIBRATION_QUICK]
 description: Run quick calibration (Z-offset + PA + Bed Mesh, ~30 min)
-group: Calibration
 gcode:
     RESPOND MSG="=============================================="
     RESPOND MSG="   STARTING QUICK CALIBRATION"
diff --git a/calibration/test_patterns.cfg b/calibration/test_patterns.cfg
index 2384b59..0869253 100644
--- a/calibration/test_patterns.cfg
+++ b/calibration/test_patterns.cfg
@@ -9,7 +9,6 @@
 # ----------------------------------------------------------------------------
 [gcode_macro PA_TEST_PATTERN]
 description: Print Pressure Advance test pattern
-group: Calibration
 gcode:
     {% set START_PA = params.START|default(0.01)|float %}
     {% set END_PA = params.END|default(0.05)|float %}
@@ -67,7 +66,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro FLOW_TEST_CUBE]
 description: Print flow rate calibration cube
-group: Calibration
 gcode:
     {% set START_FLOW = params.START|default(0.90)|float %}
     {% set END_FLOW = params.END|default(1.10)|float %}
@@ -137,7 +135,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro RETRACT_TEST_PATTERN]
 description: Print retraction test pattern
-group: Calibration
 gcode:
     {% set START_RETRACT = params.START|default(1.0)|float %}
     {% set END_RETRACT = params.END|default(4.0)|float %}
@@ -213,7 +210,6 @@ gcode:
 # ----------------------------------------------------------------------------
 [gcode_macro TEMP_TOWER]
 description: Print temperature tower
-group: Calibration
 gcode:
     {% set START_TEMP = params.START|default(195)|int %}
     {% set END_TEMP = params.END|default(225)|int %}
diff --git a/optimized_user_settings.cfg b/optimized_user_settings.cfg
index 4baf97d..23f91ab 100644
--- a/optimized_user_settings.cfg
+++ b/optimized_user_settings.cfg
@@ -79,7 +79,6 @@ runout_gcode:
 # ============================================================================
 
 [gcode_macro PRINT_START]
-group: Printing
 gcode:
     #--- Setup & Reset ---
     M117 Setting up parameters...
@@ -134,7 +133,6 @@ gcode:
 # ============================================================================
 
 [gcode_macro PRINT_END]
-group: Printing
 gcode:
     M117 Finishing print...
     RESPOND MSG="Print completed! Finishing up..."
@@ -165,7 +163,6 @@ gcode:
 
 [gcode_macro QUICK_TOUCH]
 description: Quick Z measurement with Cartographer
-group: Calibration
 gcode:
     {% if printer.toolhead.homed_axes != "xyz" %}
         G28
@@ -175,7 +172,6 @@ gcode:
 
 [gcode_macro CALIBRATE_PROBE]
 description: Manual Z-offset calibration
-group: Calibration
 gcode:
     {% if printer.toolhead.homed_axes != "xyz" %}
         G28
@@ -184,12 +180,10 @@ gcode:
     CARTOGRAPHER_CALIBRATE
 
 [gcode_macro BABYZ_PLUS]
-group: Helpers
 gcode:
     SET_GCODE_OFFSET Z_ADJUST=0.005 MOVE=1
 
 [gcode_macro BABYZ_MINUS]
-group: Helpers
 gcode:
     SET_GCODE_OFFSET Z_ADJUST=-0.005 MOVE=1
 
diff --git a/user_settings_clean.cfg b/user_settings_clean.cfg
index 4baf97d..23f91ab 100644
--- a/user_settings_clean.cfg
+++ b/user_settings_clean.cfg
@@ -79,7 +79,6 @@ runout_gcode:
 # ============================================================================
 
 [gcode_macro PRINT_START]
-group: Printing
 gcode:
     #--- Setup & Reset ---
     M117 Setting up parameters...
@@ -134,7 +133,6 @@ gcode:
 # ============================================================================
 
 [gcode_macro PRINT_END]
-group: Printing
 gcode:
     M117 Finishing print...
     RESPOND MSG="Print completed! Finishing up..."
@@ -165,7 +163,6 @@ gcode:
 
 [gcode_macro QUICK_TOUCH]
 description: Quick Z measurement with Cartographer
-group: Calibration
 gcode:
     {% if printer.toolhead.homed_axes != "xyz" %}
         G28
@@ -175,7 +172,6 @@ gcode:
 
 [gcode_macro CALIBRATE_PROBE]
 description: Manual Z-offset calibration
-group: Calibration
 gcode:
     {% if printer.toolhead.homed_axes != "xyz" %}
         G28
@@ -184,12 +180,10 @@ gcode:
     CARTOGRAPHER_CALIBRATE
 
 [gcode_macro BABYZ_PLUS]
-group: Helpers
 gcode:
     SET_GCODE_OFFSET Z_ADJUST=0.005 MOVE=1
 
 [gcode_macro BABYZ_MINUS]
-group: Helpers
 gcode:
     SET_GCODE_OFFSET Z_ADJUST=-0.005 MOVE=1