diff --git a/automations/alerts/battery_alert.yaml b/automations/alerts/battery_alert.yaml
deleted file mode 100644
index 07cc0f3..0000000
--- a/automations/alerts/battery_alert.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-alias: "Battery Alert"
-id: automation_battery_alert
-initial_state: off
-trigger:
-  - platform: time
-    at: "10:00:00"
-  - platform: time
-    at: "18:00:00"
-condition:
-  condition: or
-  conditions:
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.light if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.switch if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.sensor if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.zwave if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.lock if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-action:
-  - service: notify.mobile_app_pixel_7
-    data:
-      message: >-
-        {% set threshold = 1 %}
-        {%- for item in states.light if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int / 5 < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {% for lobat in states.light if (lobat.attributes.battery_level is defined and lobat.attributes['battery_level'] | int / 5 < threshold) or ("battery" in lobat.name | lower and ((item.state | int < threshold and lobat.state|int != 0) or lobat.state | lower == "low" or lobat.state | lower == "unknown")) %}
-        {%- if loop.first %}Lights:{% endif %}
-        {{ lobat.name }} {{ lobat.state }}%
-        {%- endfor -%}
-        {% endif %}
-        {%- endfor %}
-
-        {% set threshold = 1 %}
-        {%- for item in states.switch if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int / 5 < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {% for lobat in states.switch if (lobat.attributes.battery_level is defined and lobat.attributes['battery_level'] | int / 5 < threshold) or ("battery" in lobat.name | lower and ((item.state | int < threshold and lobat.state|int != 0) or lobat.state | lower == "low" or lobat.state | lower == "unknown")) %}
-        {%- if loop.first %}Switches:{% endif %}
-        {{ lobat.name }} {{ lobat.state }}%
-        {%- endfor -%}
-        {% endif %}
-        {%- endfor %}
-
-        {% set threshold = 1 %}
-        {%- for item in states.sensor if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int / 5 < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {% for lobat in states.sensor if (lobat.attributes.battery_level is defined and lobat.attributes['battery_level'] | int / 5 < threshold) or ("battery" in lobat.name | lower and ((item.state | int < threshold and lobat.state|int != 0) or lobat.state | lower == "low" or lobat.state | lower == "unknown")) %}
-        {%- if loop.first %}Sensors:{% endif %}
-        {{ lobat.name }} {{ lobat.state }}%
-        {%- endfor -%}
-        {% endif %}
-        {%- endfor %}
-
-        {% set threshold = 1 %}
-        {%- for item in states.zwave if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int / 5 < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {% for lobat in states.zwave if (lobat.attributes.battery_level is defined and lobat.attributes['battery_level'] | int / 5 < threshold) or ("battery" in lobat.name | lower and ((item.state | int < threshold and lobat.state|int != 0) or lobat.state | lower == "low" or lobat.state | lower == "unknown")) %}
-        {%- if loop.first %}Zwaves:{% endif %}
-        {{ lobat.name }} {{ lobat.state }}%
-        {%- endfor -%}
-        {% endif %}
-        {%- endfor %}
-
-        {% set threshold = 1 %}
-        {%- for item in states.lock if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int / 5 < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {% for lobat in states.lock if (lobat.attributes.battery_level is defined and lobat.attributes['battery_level'] | int / 5 < threshold) or ("battery" in lobat.name | lower and ((item.state | int < threshold and lobat.state|int != 0) or lobat.state | lower == "low" or lobat.state | lower == "unknown")) %}
-        {%- if loop.first %}Locks:{% endif %}
-        {{ lobat.name }} {{ lobat.state }}%
-        {%- endfor -%}
-        {% endif %}
-        {%- endfor %}
diff --git a/automations/alerts/battery_alert_template.yaml b/automations/alerts/battery_alert_template.yaml
deleted file mode 100644
index 2f80698..0000000
--- a/automations/alerts/battery_alert_template.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-alias: "Battery Alert Template"
-id: automation_battery_alert_template
-initial_state: off
-trigger:
-  - platform: time
-    at: "10:00:00"
-  - platform: time
-    at: "18:00:00"
-condition:
-  condition: or
-  conditions:
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.light if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.switch if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.sensor if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.zwave if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.lock if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-    - condition: template
-      value_template: >-
-        {%- set threshold = 40 -%}
-        {%- for item in states.binary_sensor if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) -%}
-        {%- if loop.first -%}
-        {{ true }}
-        {%- endif -%}
-        {%- endfor -%}
-action:
-  - service: notify.mobile_app_pixel_7
-    data:
-      message: >-
-        {% set threshold = 40 %}
-
-        {% for item in states.binary_sensor if (item.attributes.battery_level is defined and item.attributes['battery_level'] | int / 5 < threshold) or ("battery" in item.name | lower and ((item.state | int < threshold and item.state|int != 0) or item.state | lower == "low" or item.state | lower == "unknown")) %}
-        {%- if loop.first %}Binary Sensors:{% endif %}
-        {{ item.name }} {{ item.attributes.battery_level / 5 }}%
-        {%- endfor -%}
diff --git a/automations/alerts/something_open_hvac_on.yaml b/automations/alerts/something_open_hvac_on.yaml
index 1c8bdc1..b5c377d 100644
--- a/automations/alerts/something_open_hvac_on.yaml
+++ b/automations/alerts/something_open_hvac_on.yaml
@@ -1,7 +1,7 @@
 alias: "Alert that something is open and the HVAC equipment is on"
 id: automation_something_open_hvac_on
 
-trigger:
+triggers:
   platform: state
   entity_id: binary_sensor.something_open_hvac_on
   from: "off"
@@ -18,9 +18,6 @@ action:
         actions:
           - action: "ALARM" # The key you are sending for the event
             title: "Sound Alarm" # The button title
-          - action: "URI" # Must be set to URI if you plan to use a URI
-            title: "Open Url"
-            uri: "https://google.com" # URL to open when action is selected, can also be a lovelace view/dashboard
           - action: "URI"
             title: "Adjust Thermostat"
             uri: "entityId:climate.thermostat"
\ No newline at end of file
diff --git a/automations/cameras/frigate_cam04_detect.yaml b/automations/cameras/frigate_cam04_detect.yaml
deleted file mode 100644
index 526f2b3..0000000
--- a/automations/cameras/frigate_cam04_detect.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-alias: Frigate Cam04 Detect
-id: automation_frigate_cam04_detect
-mode: restart
-
-trigger:
-  - platform: homeassistant
-    event: start
-
-  - id: motion
-    platform: state
-    entity_id: group.garage_motion
-
-  - id: doors
-    platform: state
-    entity_id: group.my_garage_doors
-
-  - id: occupancy
-    platform: state
-    entity_id: binary_sensor.frigate_cam04_person_occupancy
-
-action:
-  - choose:
-    - conditions:
-        - condition: state
-          entity_id: group.garage_motion
-          state: 'on'
-        - condition: state
-          entity_id: switch.frigate_cam04_detect
-          state: 'off'
-      sequence:
-        - service: switch.turn_on
-          data: {}
-          target:
-            entity_id:
-              - switch.frigate_cam04_detect
-
-    - conditions:
-        - condition: state
-          entity_id: group.my_garage_doors
-          state: 'on'
-        - condition: state
-          entity_id: switch.frigate_cam04_detect
-          state: 'off'
-      sequence:
-        - service: switch.turn_on
-          data: {}
-          target:
-            entity_id:
-              - switch.frigate_cam04_detect
-
-    - conditions:
-        - condition: state
-          entity_id: group.garage_motion
-          state: 'off'
-        - condition: state
-          entity_id: group.my_garage_doors
-          state: 'off'
-        - condition: state
-          entity_id: binary_sensor.frigate_cam04_person_occupancy
-          state: 'off'
-        - condition: state
-          entity_id: switch.frigate_cam04_detect
-          state: 'on'
-      sequence:
-        - delay:
-            minutes: 5
-        - service: switch.turn_off
-          data: {}
-          target:
-            entity_id:
-              - switch.frigate_cam04_detect
\ No newline at end of file
diff --git a/automations/people/Tess/tess_home.yaml b/automations/people/Tess/tess_home.yaml
index cf35b30..59adb48 100644
--- a/automations/people/Tess/tess_home.yaml
+++ b/automations/people/Tess/tess_home.yaml
@@ -6,11 +6,6 @@ trigger:
   - platform: event
     event_type: automation_reloaded
 
-  - platform: state
-    entity_id:
-      - group.person_tess
-      - device_tracker.apple_17_a6_78
-    to: 'home'
 condition:
   - alias: 'They were previously considered away'
     condition: state
diff --git a/automations/things/handle_light_tag_scan.yaml b/automations/things/handle_light_tag_scan.yaml
index 8210fb2..a17427a 100644
--- a/automations/things/handle_light_tag_scan.yaml
+++ b/automations/things/handle_light_tag_scan.yaml
@@ -8,7 +8,6 @@ variables:
   # Map scanner device ID to media player entity ID
   devices:
     299e280bcc3579ca9b3ef714677dbf9b: nursery_tagreader
-    75060fd1afdd90be: pixel_4
 
   # Map tag ID to content
   tags:
diff --git a/components/alerts/README.md b/components/alerts/README.md
deleted file mode 100644
index a881592..0000000
--- a/components/alerts/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Alerts
-
-Component: [alert](https://home-assistant.io/components/alert/)
-
-## Garage
-
-Simple alerts to nag us that we've left either of the the garage doors open. We need this because they're not visible from the house.
diff --git a/components/alerts/front_door.yaml b/components/alerts/front_door.yaml
index 2e94447..13abe2f 100644
--- a/components/alerts/front_door.yaml
+++ b/components/alerts/front_door.yaml
@@ -6,4 +6,4 @@ repeat: 10
 can_acknowledge: True
 skip_first: True
 notifiers:
-  - garage
+  - mobile_app_pixel_7
diff --git a/components/alerts/need_salt.yaml b/components/alerts/need_salt.yaml
index 9fd0c80..2b1c1d5 100644
--- a/components/alerts/need_salt.yaml
+++ b/components/alerts/need_salt.yaml
@@ -1,5 +1,5 @@
 name: "Water softener is low on salt"
-done_message: "Water sotener has enough salt"
+done_message: "Water softener has enough salt"
 entity_id: binary_sensor.need_salt
 state: 0
 repeat:
diff --git a/components/binary_sensors/bayesian_wfh.yaml b/components/binary_sensors/bayesian_wfh.yaml
index f9ea1a7..18eeb38 100644
--- a/components/binary_sensors/bayesian_wfh.yaml
+++ b/components/binary_sensors/bayesian_wfh.yaml
@@ -23,7 +23,7 @@ observations:
     # Probability that I'm not working from home when person.clint is at AGH
     prob_given_false: .7
     platform: 'state'
-    to_state: 'AGH'
+    to_state: 'WMU'
     # Probability that I'm working from home from 8:00 AM to 4:30 PM
   - entity_id: binary_sensor.work_hours
     prob_given_true: .4
diff --git a/components/binary_sensors/floorplan.yaml b/components/binary_sensors/floorplan.yaml
deleted file mode 100644
index 1b5523c..0000000
--- a/components/binary_sensors/floorplan.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Disabling the first two lines, as I don't think they are even necessary
-# If they need to be re-implemented, refer to this:
-#  https://www.home-assistant.io/integrations/binary_sensor.mqtt/#new_format
-
-# platform: mqtt
-# state_topic: dummy/floorplan/sensor
-
-
-
-
-# #name: Floorplan
-# #custom_ui_state_card: state-card-floorplan
-# #config: !include ../../floorplan.yaml
\ No newline at end of file
diff --git a/components/binary_sensors/is_friday.yaml b/components/binary_sensors/is_friday.yaml
deleted file mode 100644
index ae18419..0000000
--- a/components/binary_sensors/is_friday.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# platform: workday
-# name: Is Friday
-# country: US
-# workdays: [fri]
-# excludes: [mon,tue, wed, thu, sat, sun]
\ No newline at end of file
diff --git a/components/binary_sensors/is_monday.yaml b/components/binary_sensors/is_monday.yaml
deleted file mode 100644
index 26b499c..0000000
--- a/components/binary_sensors/is_monday.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# platform: workday
-# name: Is Monday
-# country: US
-# workdays: [mon]
-# excludes: [tue, wed, thu, fri,sat, sun, holiday]
\ No newline at end of file
diff --git a/components/binary_sensors/is_tuesday.yaml b/components/binary_sensors/is_tuesday.yaml
deleted file mode 100644
index 7a9d178..0000000
--- a/components/binary_sensors/is_tuesday.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# platform: workday
-# name: Is Tuesday
-# country: US
-# workdays: [tue]
-# excludes: [mon, wed, thu, fri,sat, sun, holiday]
\ No newline at end of file
diff --git a/components/binary_sensors/weekday.yaml b/components/binary_sensors/weekday.yaml
deleted file mode 100644
index 8631ad1..0000000
--- a/components/binary_sensors/weekday.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# platform: workday
-# name: Weekday
-# country: US
-# workdays: [mon, tue, wed, thu, fri]
-# excludes: [sat, sun]
\ No newline at end of file
diff --git a/components/binary_sensors/work_tomorrow.yaml b/components/binary_sensors/work_tomorrow.yaml
deleted file mode 100644
index f0e7b08..0000000
--- a/components/binary_sensors/work_tomorrow.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# platform: workday
-# name: Work Day Tomorrow
-# country: US
-# workdays: [mon, tue, wed, thu, fri]
-# excludes: [sat, sun, holiday]
-# days_offset: 1
-# remove_holidays:
-# #  - "Martin Luther King Jr. Day"
-#   - "Washington's Birthday"
-#   - "Juneteenth"
-#   - "Columbus Day"
-#   - "Veterans Day"
\ No newline at end of file
diff --git a/components/binary_sensors/workday.yaml b/components/binary_sensors/workday.yaml
deleted file mode 100644
index 1243e68..0000000
--- a/components/binary_sensors/workday.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# platform: workday
-# name: Work Day
-# country: US
-# workdays: [mon, tue, wed, thu, fri]
-# excludes: [sat, sun, holiday]
-# remove_holidays:
-# #  - "Martin Luther King Jr. Day"
-#   - "Washington's Birthday"
-#   - "Juneteenth"
-#   - "Columbus Day"
-#   - "Veterans Day"
\ No newline at end of file
diff --git a/components/device_trackers/bluetooth.yaml b/components/device_trackers/bluetooth.yaml
deleted file mode 100644
index fe03ac7..0000000
--- a/components/device_trackers/bluetooth.yaml
+++ /dev/null
@@ -1 +0,0 @@
-#platform: bluetooth_tracker
\ No newline at end of file
diff --git a/components/device_trackers/bluetooth_le.yaml b/components/device_trackers/bluetooth_le.yaml
deleted file mode 100644
index eb9acc3..0000000
--- a/components/device_trackers/bluetooth_le.yaml
+++ /dev/null
@@ -1 +0,0 @@
-#platform: bluetooth_le_tracker
\ No newline at end of file
diff --git a/groups.yaml b/groups.yaml
index 851efb2..2e22557 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -199,7 +199,6 @@ person_kristy:
   name: Kristy
   entities:
     - device_tracker.kristy_s_phone
-    - device_tracker.pixel_4_wifi
 
 person_marshall:
   name: Marshall