Moving off smartthings to mqtt and using direct ST integration

lights/living_room.yaml

@@ -20,16 +20,6 @@
   payload_on: "on"
   payload_off: "off"
   retain: true
-- platform: mqtt
-  name: "Table Lamp"
-  state_topic: "smartthings/Table Lamp/switch"
-  command_topic: "smartthings/Table Lamp/switch"
-  brightness_state_topic: "smartthings/Table Lamp/level"
-  brightness_command_topic: "smartthings/Table Lamp/level"
-  brightness_scale: 101
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
 - platform: mqtt
   name: "Master Bedroom Lamp"
   state_topic: "smartthings/Jeff Lamp/switch"

switches/bedroom.yaml

@@ -1,8 +1,8 @@
-- platform: mqtt
+# - platform: mqtt
-  name: "Rainbow Light"
+#   name: "Rainbow Light"
-  state_topic: "smartthings/Rainbow Light/switch"
+#   state_topic: "smartthings/Rainbow Light/switch"
-  command_topic: "smartthings/Rainbow Light/switch"
+#   command_topic: "smartthings/Rainbow Light/switch"
-  payload_on: "on"
+#   payload_on: "on"
-  payload_off: "off"
+#   payload_off: "off"
-  retain: true
+#   retain: true
 

switches/living_room.yaml

@@ -1,14 +1,14 @@
-- platform: mqtt
+# - platform: mqtt
-  name: "Incense"
+#   name: "Incense"
-  state_topic: "smartthings/Incense/switch"
+#   state_topic: "smartthings/Incense/switch"
-  command_topic: "smartthings/Incense/switch"
+#   command_topic: "smartthings/Incense/switch"
-  payload_on: "on"
+#   payload_on: "on"
-  payload_off: "off"
+#   payload_off: "off"
-  retain: true
+#   retain: true
-- platform: mqtt
+# - platform: mqtt
-  name: "Living Room Fan"
+#   name: "Living Room Fan"
-  state_topic: "smartthings/Living Room Fan/switch"
+#   state_topic: "smartthings/Living Room Fan/switch"
-  command_topic: "smartthings/Living Room Fan/switch"
+#   command_topic: "smartthings/Living Room Fan/switch"
-  payload_on: "on"
+#   payload_on: "on"
-  payload_off: "off"
+#   payload_off: "off"
-  retain: true
+#   retain: true