diff --git a/config/binary_sensors/doors.yaml b/config/binary_sensors/doors.yaml
deleted file mode 100755
index afce9aa..0000000
--- a/config/binary_sensors/doors.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# - platform: mqtt
-#   name: "Back Door"
-#   state_topic: "zwave2mqtt/back_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: door
-# - platform: mqtt
-#   name: "Garage Door"
-#   state_topic: "zwave2mqtt/garage_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: garage_door
-# - platform: mqtt
-#   name: "Front Door"
-#   state_topic: "zwave2mqtt/front_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: door
-# - platform: mqtt
-#   name: "Laundry Room Door"
-#   state_topic: "zwave2mqtt/laundry_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: door
-# - platform: mqtt
-#   name: "Attic Door" # Dome Door Sensor
-#   state_topic: "zwave2mqtt/attic_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: door
-# - platform: mqtt
-#   name: "Side Door" # Dome Door Sensor
-#   state_topic: "zwave2mqtt/side_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: door
-# - platform: mqtt
-#   name: "Washer Door"
-#   state_topic: "zwave2mqtt/washer_door/48/1/0"
-#   payload_on: "true"
-#   payload_off: "false"
-#   device_class: door
\ No newline at end of file
diff --git a/config/binary_sensors/general.yaml b/config/binary_sensors/general.yaml
deleted file mode 100755
index cf1777d..0000000
--- a/config/binary_sensors/general.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-- platform: mqtt
-  name: "Lightning Detected" 
-  state_topic: "house/acurite-6045M/lightning_active"
-  payload_on: "1"
-  payload_off: "0"
-  device_class: safety
-- platform: mqtt
-  name: "Back Porch Sensor Battery" 
-  state_topic: "house/acurite-6045M/battery"
-  payload_on: "1"
-  payload_off: "0"
-  device_class: battery
-- platform: mqtt
-  name: "Garage Sensor Battery" 
-  state_topic: "house/acurite-10968/battery"
-  payload_on: "1"
-  payload_off: "0"
-  device_class: battery
-- platform: mqtt
-  name: "Crawlspace Sensor Battery" 
-  state_topic: "house/acurite-158/battery"
-  payload_on: "1"
-  payload_off: "0"
-  device_class: battery
\ No newline at end of file
diff --git a/config/sensors/batteries.yaml b/config/sensors/batteries.yaml
deleted file mode 100755
index 38c2ce4..0000000
--- a/config/sensors/batteries.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- platform: mqtt
-  name: "Battery Front Door Sensor"
-  state_topic: "zwave2mqtt/front_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/front_door/128/1/0"
-- platform: mqtt
-  name: "Battery Laundry Door Sensor"
-  state_topic: "zwave2mqtt/laundry_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/laundry_door/128/1/0"
-- platform: mqtt
-  name: "Battery Kitchen Smoke Detector"
-  state_topic: "zwave2mqtt/kitchen_smoke/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/kitchen_smoke/128/1/0"
-- platform: mqtt
-  name: "Battery Garage Smoke Detector"
-  state_topic: "zwave2mqtt/garage_smoke/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/garage_smoke/128/1/0"
-- platform: mqtt
-  name: "Battery Attic Door Sensor"
-  state_topic: "zwave2mqtt/attic_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/attic_door/128/1/0"
-- platform: mqtt
-  name: "Battery Washer Door Sensor"
-  state_topic: "zwave2mqtt/washer_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/washer_door/128/1/0"
-- platform: mqtt
-  name: "Battery Back Door Sensor"
-  state_topic: "zwave2mqtt/back_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/back_door/128/1/0"
-- platform: mqtt
-  name: "Battery Side Door Sensor"
-  state_topic: "zwave2mqtt/side_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/side_door/128/1/0"
-- platform: mqtt
-  name: "Battery Garage Door Sensor"
-  state_topic: "zwave2mqtt/garage_door/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/garage_door/128/1/0"
-- platform: mqtt 
-  name: "Battery Garage Motion Sensor"
-  state_topic: "zwave2mqtt/garage_motion/128/1/0"
-  unit_of_measurement: "%"
-  device_class: battery
-  value_template: "{{ value }}"
-  json_attributes_topic: "zwave2mqtt/garage_motion/128/1/0"
\ No newline at end of file