diff --git a/printer.cfg b/printer.cfg
index 4f906be..2b1a891 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -12,7 +12,6 @@
 baud: 250000
 serial: /dev/btt-octopus-11
 
-
 [temperature_sensor Octopus]
 sensor_type: temperature_mcu
 min_temp: 0
@@ -105,8 +104,10 @@ rotation_distance: 40
 microsteps: 64
 homing_speed: 50
 homing_retract_dist: 0
+position_max: 500
 
 [stepper_y]
+position_max: 500
 step_pin: PG0
 dir_pin: PG1
 enable_pin: !PF15
@@ -124,6 +125,7 @@ rotation_distance: 4
 microsteps: 64
 position_min: -5 # Needed for z-offset calibration and tilt_adjust.
 homing_speed: 10
+position_max: 500
 
 [stepper_z1]
 step_pin: PE2
@@ -166,102 +168,52 @@ square_corner_velocity: 5
 uart_pin: PC4
 run_current: 1.1
 stealthchop_threshold: 1
+driver_TBL: 1
+driver_TOFF: 3
+driver_HEND: 0
+driver_HSTRT: 0
 
 [tmc2209 stepper_y]
-uart_pin: y_uart_pin
+uart_pin: PD11
 run_current: 1.1
 stealthchop_threshold: 1
+driver_TBL: 1
+driver_TOFF: 3
+driver_HEND: 0
+driver_HSTRT: 0
+
+[tmc2209 stepper_z]
+uart_pin: PE4
+run_current: 1.0
+stealthchop_threshold: 1
+driver_TBL: 1
+driver_TOFF: 3
+driver_HEND: 0
+driver_HSTRT: 0
+
+[tmc2209 stepper_z1]
+uart_pin: PE1
+run_current: 1.1
+stealthchop_threshold: 1
+driver_TBL: 1
+driver_TOFF: 3
+driver_HEND: 0
+driver_HSTRT: 0
+
+[tmc2209 stepper_z2]
+uart_pin: PD3
+run_current: 1.0
+stealthchop_threshold: 1
+driver_TBL: 1
+driver_TOFF: 3
+driver_HEND: 0
+driver_HSTRT: 0
 
 [tmc2209 extruder]
 uart_pin:  PC6
-run_current: 0.5
+run_current: 0.35
 stealthchop_threshold: 0
 
-[tmc2209 stepper_z]
-uart_pin: z0_uart_pin
-run_current: 1.0
-stealthchop_threshold: 1
-
-[tmc2209 stepper_z1]
-uart_pin: PE1
-run_current: 1.1
-stealthchop_threshold: 1
-
-[tmc2209 stepper_z2]
-uart_pin: PD3
-run_current: 1.0
-stealthchop_threshold: 1
-
-
-[tmc2209 stepper_x]
-uart_pin: PC4
-run_current: 1.1
-stealthchop_threshold: 1
-
-[tmc2209 stepper_y]
-uart_pin: y_uart_pin
-run_current: 1.1
-stealthchop_threshold: 1
-
-[tmc2209 extruder]
-uart_pin:  PC6
-run_current: 0.5
-stealthchop_threshold: 0
-
-[tmc2209 stepper_z]
-uart_pin: z0_uart_pin
-run_current: 1.0
-stealthchop_threshold: 1
-
-[tmc2209 stepper_z1]
-uart_pin: PE1
-run_current: 1.1
-stealthchop_threshold: 1
-
-[tmc2209 stepper_z2]
-uart_pin: PD3
-run_current: 1.0
-stealthchop_threshold: 1
-
-[tmc2209 stepper_x]
-uart_pin: PC4
-run_current: 1.1
-driver_TBL: 1
-driver_TOFF: 3
-driver_HEND: 0
-driver_HSTRT: 0
-
-[tmc2209 stepper_y]
-uart_pin: y_uart_pin
-run_current: 1.1
-driver_TBL: 1
-driver_TOFF: 3
-driver_HEND: 0
-driver_HSTRT: 0
-
-[tmc2209 stepper_z]
-uart_pin: z0_uart_pin
-run_current: 1.1
-driver_TBL: 1
-driver_TOFF: 3
-driver_HEND: 0
-driver_HSTRT: 0
-
-[tmc2209 stepper_z1]
-uart_pin: PE1
-run_current: 1.1
-driver_TBL: 1
-driver_TOFF: 3
-driver_HEND: 0
-driver_HSTRT: 0
-
-[tmc2209 stepper_z2]
-uart_pin: PD3
-run_current: 1.1
-driver_TBL: 1
-driver_TOFF: 3
-driver_HEND: 0
-driver_HSTRT: 0
 
 #############################################################################################################
 ### HOMING
@@ -274,7 +226,7 @@ control_pin: PB6
 speed: 7
 pin_move_time: 0.675
 sample_retract_dist: 10
-
+pin_move_time: 0.8
 pin_up_reports_not_triggered: True
 pin_up_touch_mode_reports_triggered: True
 x_offset: -28
@@ -302,14 +254,6 @@ z_hop: 12
 #############################################################################################################
 
 
-[stepper_x]
-position_max: 500
-
-[stepper_y]
-position_max: 500
-
-[stepper_z]
-position_max: 500
 
 [bed_mesh]
 horizontal_move_z: 5
@@ -357,10 +301,6 @@ min_temp: 0
 max_temp: 400
 pressure_advance: 0.05
 
-[tmc2209 extruder]
-run_current: 0.35
-stealthchop_threshold: 0
-
 [firmware_retraction]
 retract_speed: 60
 unretract_extra_length: 0
@@ -471,16 +411,6 @@ dir_pin: !PA14 # Add ! in front of pin name to reverse Z2 direction
 rotation_distance: 4 # 4 for TR8*4 lead screws
 endstop_pin: probe: z_virtual_endstop
 
-#Z Probe configuration
-[bltouch]
-sensor_pin: ^PB7
-control_pin: PB6
-x_offset: -27.0
-y_offset: -21.0
-#pin_up_touch_mode_reports_triggered: True
-pin_move_time: 0.8
-#z_offset: 3.20 # USE FOR PLA
-#z_offset: 2.75 # USE FOR PETG
 
 # [probe]
 # z_offset: 1.0 # Adjust this to fit your setup -> "1.0" is placeholder!