diff --git a/mqtt_client.py b/mqtt_client.py
index 12a7f04..3b7e5b8 100644
--- a/mqtt_client.py
+++ b/mqtt_client.py
@@ -2,44 +2,20 @@
 
 import argparse
 import json
-import time
 
 import paho.mqtt.client as mqtt
 import mixer
 from mixer import Mixer
 
-
 MQTT_SERVER_PORT = 1883
-MQTT_DISCOVERY_TOPIC = "homeassistant/button/mixer/config"
-MQTT_COMMAND_TOPIC = "livingroom/voc/allen_heath_qu16_mixer"
+MQTT_TOPIC = "homeassistant/device/mixer"
 
 m: Mixer = None
 
 
-def mqtt_autodiscovery(client):
-    j = json.dumps(
-        {
-            "name": "Reset Settings",
-            "command_topic": MQTT_COMMAND_TOPIC,
-            "command_template": '{"command": "scene_recall", "args": {"scene_id": 0}}',
-            "device": {
-                "name": "Mischpult",
-                "model": "Qu-16",
-                "manufacturer": "Allen & Heath",
-                "suggested_area": "livingroom",
-                "identifiers": "Mischpult",
-            },
-            "unique_id": "mischpult_reset_settings",
-        }
-    )
-
-    client.publish(MQTT_DISCOVERY_TOPIC, payload=j, qos=0, retain=False)
-
-
 def on_connect(client, userdata, flags, reason_code, properties):
     print(f"Connected: {reason_code}")
-    client.subscribe(MQTT_COMMAND_TOPIC)
-    mqtt_autodiscovery(client)
+    client.subscribe(MQTT_TOPIC)
 
 
 def on_message(client, userdata, msg):
@@ -60,18 +36,6 @@ def main():
     parser = argparse.ArgumentParser(description="Allen & Heath Qu MQTT Remote Control")
     parser.add_argument("mixer_ip", help="IP of the mixer")
     parser.add_argument("mqtt_hostname", help="IP of the MQTT broker")
-
-    subparsers = parser.add_subparsers(
-        dest="command", required=True, help="Available commands"
-    )
-
-    subparsers.add_parser("shutdown", help="Shut down the mixer")
-
-    scene_parser = subparsers.add_parser("scene_recall", help="Recall a specific scene")
-    scene_parser.add_argument(
-        "scene_number", type=int, choices=range(0, 100), help="Scene number to recall"
-    )
-
     args = parser.parse_args()
 
     print(f"Mixer IP: {args.mixer_ip}, MQTT broker hostname: {args.mqtt_hostname}")