diff --git a/config/binary_sensors/motion.yaml b/config/binary_sensors/motion.yaml
index ce1e702..c05f1bc 100755
--- a/config/binary_sensors/motion.yaml
+++ b/config/binary_sensors/motion.yaml
@@ -1,23 +1,4 @@
-# - platform: mqtt
-#   name: "Garage Motion" # Dome Motion Sensor
-#   state_topic: "zwave2mqtt/garage_motion/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: motion
 
-# - platform: mqtt
-#   name: "Kitchen Motion" # Kaipule Motion Sensor
-#   state_topic: "zwave2mqtt/kitchen_motion/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: motion
-
-# - platform: command_line 
-#   name: vlc player
-#   command: 'pidof vlc | wc -l'
-#   payload_on: 1
-#   payload_off: 0
-#   scan_interval: 10
 
 - platform: aarlo
   monitored_conditions:
diff --git a/config/groups.yaml b/config/groups.yaml
index d8222ee..e9d0406 100755
--- a/config/groups.yaml
+++ b/config/groups.yaml
@@ -20,10 +20,11 @@ House Conditions:
   - sensor.accurite_garage_humidity
 
 occupancy:
+  - binary_sensor.living_room_motion_occupancy
   - binary_sensor.kitchen_motion_occupancy
   - binary_sensor.skylar_bedroom_motion_occupancy
   - binary_sensor.master_bedroom_motion_occupancy
-  - binary_sensor.croft_occupancy
+  - binary_sensor.back_door_motion
 
 audio_devices:
   - media_player.kitchen_display
diff --git a/config/packages/appliances.yaml b/config/packages/appliances.yaml
index 1ba102f..80b8f0d 100755
--- a/config/packages/appliances.yaml
+++ b/config/packages/appliances.yaml
@@ -27,7 +27,7 @@ automation:
     alias: Washer Running
     trigger:
     - above: 5
-      entity_id: sensor.washer_energy_w
+      entity_id: sensor.washer_power_consumed_w
       platform: numeric_state
     condition:
       condition: or
@@ -41,19 +41,19 @@ automation:
     action:
     - service: script.washer_running
     # Since the washer has run lets consume a detergent tablet
-    - service: shell_command.grocy_consume_item
-      data:
-        server_ip: !secret grocy_ip
-        grocy_key: !secret grocy_api_key
-        product_id: 6
-        amount: 1
+    # - service: shell_command.grocy_consume_item
+    #   data:
+    #     server_ip: !secret grocy_ip
+    #     grocy_key: !secret grocy_api_key
+    #     product_id: 6
+    #     amount: 1
     initial_state: true
 
   - id: washer_complete
     alias: Washer Complete
     trigger:
     - below: 3
-      entity_id: sensor.washer_energy_w
+      entity_id: sensor.washer_power_consumed_w
       platform: numeric_state
     condition:
     - condition: state
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index 7471fdc..f6fef94 100755
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -280,8 +280,7 @@ automation:
     - choose:
       - conditions:
         - condition: template
-          value_template: '{{ trigger.to_state.attributes.friendly_name == "Dog Mode"
-            }}'
+          value_template: '{{ trigger.to_state.attributes.friendly_name == "Dog Mode" }}'
         sequence:
         - service: script.text_notify
           data:
diff --git a/config/sensors/house.yaml b/config/sensors/house.yaml
index a6ce485..d6d3220 100755
--- a/config/sensors/house.yaml
+++ b/config/sensors/house.yaml
@@ -129,7 +129,7 @@
   sampling_size: 500
 - platform: statistics
   name: Washer Power Stats
-  entity_id: sensor.washer_power
+  entity_id: sensor.washer_power_consumed_w
   sampling_size: 500
 - platform: history_stats
   name: Cooling Last Month
diff --git a/config/sensors/power.yaml b/config/sensors/power.yaml
index 704a043..9c8d22f 100755
--- a/config/sensors/power.yaml
+++ b/config/sensors/power.yaml
@@ -1,51 +1,6 @@
-- platform: mqtt
-  name: "Washer"
-  state_topic: "zwave2mqtt/washer/50/1/0"
-  device_class: "power"
-  unit_of_measurement: "kWh"
-
-- platform: mqtt
-  name: "Washer Power 1"
-  state_topic: "zwave2mqtt/washer/49/1/4"
-  device_class: "power"
-  unit_of_measurement: "W"
-
-- platform: mqtt
-  name: "Washer_Power 2"
-  state_topic: "zwave2mqtt/washer/50/1/2"
-  device_class: "power"
-  unit_of_measurement: "W"
-
-- platform: mqtt
-  name: "Washer Power"
-  state_topic: "zwave2mqtt/washer/50/1/9"
-  device_class: "power"
-  unit_of_measurement: "W"
-
-- platform: mqtt
-  name: "Washer Power kwh"
-  state_topic: "zwave2mqtt/washer/50/1/1"
-  device_class: "power"
-  unit_of_measurement: "kWh"
-
-# zooz
-
-- platform: mqtt
-  name: "theater light up"
-  state_topic: "zwave2mqtt/theater/91/1/1"
-
-- platform: mqtt
-  name: "theater light down"
-  state_topic: "zwave2mqtt/theater/91/1/2"
-
 
 - platform: template
   sensors:
-    # washer_power:
-    #   friendly_name: "Washer Power"
-    #   unit_of_measurement: ''
-    #   value_template: >-
-    #       {{ states.switch.washer.attributes.current_power_w | int }}
     low_battery:
       friendly_name: 'Low Battery'
       value_template: >
diff --git a/config/switches.yaml b/config/switches.yaml
index 410b102..24d26c0 100644
--- a/config/switches.yaml
+++ b/config/switches.yaml
@@ -1,99 +1,3 @@
-# # Living Room
-
-# - platform: mqtt
-#   name: "Incense"
-#   state_topic: "zwave2mqtt/incense/37/1/0"
-#   command_topic: "zwave2mqtt/incense/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-# - platform: mqtt
-#   name: "Living Room Fan"
-#   state_topic: "zwave2mqtt/livingroom_fan/37/1/0"
-#   command_topic: "zwave2mqtt/livingroom_fan/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-  
-# - platform: mqtt
-#   name: "Fireplace Lights"
-#   state_topic: "zwave2mqtt/fireplace_lights/37/1/0"
-#   command_topic: "zwave2mqtt/fireplace_lights/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-# # Notifications
-
-# - platform: mqtt
-#   name: "Text Notify Kat"
-#   command_topic: "kat/notify/text"
-#   state_topic: "kat/notify/text"
-#   qos: 1
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: "Audibly Notify Kat"
-#   command_topic: "kat/notify/audio"
-#   state_topic: "kat/notify/audio"
-#   qos: 1
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: "Text Notify Jeff"
-#   command_topic: "jeff/notify/text"
-#   state_topic: "jeff/notify/text"
-#   qos: 1
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: "Audibly Notify Jeff"
-#   command_topic: "jeff/notify/audio"
-#   state_topic: "jeff/notify/audio"
-#   qos: 1
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: "Text Notify House"
-#   command_topic: "house/notify/text"
-#   state_topic: "house/notify/text"
-#   qos: 1
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: "Audibly Notify House"
-#   command_topic: "house/notify/audio"
-#   state_topic: "house/notify/audio"
-#   qos: 1
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-
-# # Outside
-
-# - platform: mqtt
-#   name: "Driveway Light"
-#   state_topic: "zwave2mqtt/driveway_light/37/1/0"
-#   command_topic: "zwave2mqtt/driveway_light/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-# - platform: mqtt
-#   name: "Front Porch Light"
-#   state_topic: "zwave2mqtt/front_porch_light/37/1/0"
-#   command_topic: "zwave2mqtt/front_porch_light/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
 # Sonoff
 
 - platform: mqtt
@@ -105,78 +9,3 @@
   payload_off: "OFF"
   retain: true
 
-# # Upstairs
-
-# - platform: mqtt
-#   name: "Croft Fan"
-#   state_topic: "zwave2mqtt/croft_fan/37/1/0"
-#   command_topic: "zwave2mqtt/croft_fan/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-# - platform: mqtt
-#   name: "Skylars Desk"
-#   state_topic: "zwave2mqtt/theater_power/37/1/0"
-#   command_topic: "zwave2mqtt/theater_power/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-# - platform: mqtt
-#   name: "Croft Light"
-#   state_topic: "zwave2mqtt/croft_light/37/1/0"
-#   command_topic: "zwave2mqtt/croft_light/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-# # Appliance
-
-# - platform: mqtt
-#   name: "Washer"
-#   state_topic: "zwave2mqtt/washer/37/1/0"
-#   command_topic: "zwave2mqtt/washer/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-
-# # Theater:
-
-# - platform: mqtt
-#   name: "Theater Fan"
-#   state_topic: "zwave2mqtt/theater/37/2/0"
-#   command_topic: "zwave2mqtt/theater/37/2/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-
-
-# # alarm
-
-# # - platform: mqtt
-# #   name: "Alarm"
-# #   state_topic: "zwave2mqtt/nodeID_21/37/1/0"
-# #   command_topic: "zwave2mqtt/nodeID_21/37/1/0/set"
-# #   payload_on: "true"
-# #   payload_off: "false"
-
-# # Master Bedroom
-
-# - platform: mqtt
-#   name: "Master Bath Fan"
-#   state_topic: "zwave2mqtt/master_bath_fan/37/1/0"
-#   command_topic: "zwave2mqtt/master_bath_fan/37/1/0/set"
-#   payload_on: "true"
-#   payload_off: "false"
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-