diff --git a/gaugemqttcontinuous.py b/gaugemqttcontinuous.py
index 842f510..6220e14 100644
--- a/gaugemqttcontinuous.py
+++ b/gaugemqttcontinuous.py
@@ -600,7 +600,13 @@ def check_mqtt():
 
 def publish_discovery(client):
     """Publish all HA MQTT discovery payloads for gauges and LEDs."""
-    _dev_ref = {"identifiers": [MQTT_CLIENT_ID]}
+    _dev_ref = {
+        "identifiers": [MQTT_CLIENT_ID],
+        "name": DEVICE_NAME,
+        "model": DEVICE_MODEL,
+        "manufacturer": DEVICE_MFR,
+        "suggested_area": DEVICE_AREA,
+    }
 
     for i, g in enumerate(gauges):
         gt = gauge_topics[i]
@@ -729,9 +735,6 @@ def main():
     global _bl_dirty_since
     last_heartbeat = utime.ticks_ms()
 
-    MOVE_STATE_INTERVAL_MS = 500
-    last_move_state = utime.ticks_ms()
-
     while True:
         try:
             check_wifi()
@@ -755,13 +758,6 @@ def main():
                         g.step(direction)
                     moved_any = True
 
-            if (
-                moved_any
-                and utime.ticks_diff(now, last_move_state) >= MOVE_STATE_INTERVAL_MS
-            ):
-                publish_state(client_ref)
-                last_move_state = now
-
             if moved_any:
                 delay_us = 1_000_000 // MICROSTEPS_PER_SECOND
                 utime.sleep_us(delay_us)