diff --git a/.ha_mcp/logs/mcp_usage.jsonl b/.ha_mcp/logs/mcp_usage.jsonl
index 27dabc21..7cc688d1 100644
--- a/.ha_mcp/logs/mcp_usage.jsonl
+++ b/.ha_mcp/logs/mcp_usage.jsonl
@@ -1362,3 +1362,5 @@
 {"timestamp": "2026-08-15T22:47:06.854911+00:00", "tool_name": "ha_get_logs", "parameters": {"source": "logbook", "limit": null, "search": null, "order": "newest", "hours_back": 2, "entity_id": "sensor.octoprint_print_state_live", "end_time": null, "offset": 0, "compact": false, "level": null, "slug": null}, "execution_time_ms": 312.96229362487793, "success": true, "error_message": null, "response_size_bytes": 1101, "user_context": null}
 {"timestamp": "2026-08-15T22:47:07.492780+00:00", "tool_name": "ha_get_logs", "parameters": {"source": "error_log", "limit": 30, "search": "octoprint", "order": "newest", "hours_back": 1, "entity_id": null, "end_time": null, "offset": 0, "compact": true, "level": null, "slug": null}, "execution_time_ms": 716.0465717315674, "success": true, "error_message": null, "response_size_bytes": 10083, "user_context": null}
 {"timestamp": "2026-08-15T22:47:22.381437+00:00", "tool_name": "ha_get_state", "parameters": {"entity_id": ["sensor.octoprint_tool_0_temperature", "sensor.octoprint_tool_0_target", "sensor.octoprint_print_state_live", "sensor.octoprint_last_event"], "fields": ["entity_id", "state"], "attribute_keys": null}, "execution_time_ms": 18.755197525024414, "success": true, "error_message": null, "response_size_bytes": 828, "user_context": null}
+{"timestamp": "2026-08-15T22:52:34.960963+00:00", "tool_name": "ha_config_remove_script", "parameters": {"script_id": "octoprint_extrude_10", "wait": true}, "execution_time_ms": 89.60318565368652, "success": true, "error_message": null, "response_size_bytes": 114, "user_context": null}
+{"timestamp": "2026-08-15T22:52:35.401781+00:00", "tool_name": "ha_remove_helpers_integrations", "parameters": {"target": "button.octoprint_extrude_10", "helper_type": "template", "subentry_id": null, "confirm": true, "wait": true}, "execution_time_ms": 339.7033214569092, "success": true, "error_message": null, "response_size_bytes": 349, "user_context": null}
diff --git a/configuration.yaml b/configuration.yaml
index 99bd394c..dc624ee2 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -14,37 +14,6 @@ utility_meter:
 shell_command:
   cleanup_blink_snapshots: "find /media /config/www -name 'blink_*.jpg' -mmin +360 -delete"
 
-# Rest Commands (OctoPrint nozzle extrusion and Z moves)
-rest_command:
-  octoprint_set_tool_target:
-    url: "https://ender5pro.duckdns.org/api/printer/tool"
-    method: POST
-    content_type: "application/json"
-    headers:
-      X-Api-Key: !secret octoprint_api_key
-    payload: '{"command": "target", "targets": {"tool0": 220}}'
-  octoprint_extrude_10:
-    url: "https://ender5pro.duckdns.org/api/printer/command"
-    method: POST
-    content_type: "application/json"
-    headers:
-      X-Api-Key: !secret octoprint_api_key
-    payload: '{"commands": ["G91", "G1 E10 F300", "G90"]}'
-  octoprint_z_down_10:
-    url: "https://ender5pro.duckdns.org/api/printer/command"
-    method: POST
-    content_type: "application/json"
-    headers:
-      X-Api-Key: !secret octoprint_api_key
-    payload: '{"commands": ["G91", "G1 Z-10 F600", "G90"]}'
-  octoprint_z_down_20:
-    url: "https://ender5pro.duckdns.org/api/printer/command"
-    method: POST
-    content_type: "application/json"
-    headers:
-      X-Api-Key: !secret octoprint_api_key
-    payload: '{"commands": ["G91", "G1 Z-20 F600", "G90"]}'
-
 # Load ffmpeg
 ffmpeg:
 
diff --git a/scripts.yaml b/scripts.yaml
index e6f10ebc..08e7ee25 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -240,23 +240,3 @@ light_color_temp_helper:
       name: Mode
       description: Select switch mode
   description: "Switch color temperature of light in steps \nVersion: 2026-03-22"
-octoprint_extrude_10:
-  alias: OctoPrint Extrude 10mm
-  description: Heats the nozzle to 220C, waits until it reaches 215C, then extrudes
-    10mm of filament. Refuses to run while a print is active.
-  icon: mdi:printer-3d-nozzle-outline
-  sequence:
-  - if:
-    - condition: state
-      entity_id: binary_sensor.octoprint_printing
-      state: 'off'
-    then:
-    - action: rest_command.octoprint_set_tool_target
-    - wait_for_trigger:
-        trigger: numeric_state
-        entity_id: sensor.octoprint_tool_0_temperature
-        above: 215
-      timeout:
-        minutes: 10
-      continue_on_timeout: false
-    - action: rest_command.octoprint_extrude_10