Removing uneeded automations

automations/jeff_home_enter.yaml

@@ -1,16 +1,11 @@
 alias: "Jeff Arrives Home"
 trigger:
-#  platform: zone
+  platform: zone
-#  event: enter
+  event: enter
-#  zone: zone.home
+  zone: zone.home
-#  entity_id: device_tracker.jeffreystonesiphone
+  entity_id: device_tracker.jeffreystonesiphone
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  # Optional
-  payload: 'stationary'
 action:
   - service: notify.notify
     data:
       title: "Jarvis"
-      message: "Jeff has arrived home"
+      message: "Jeff is arriving home"
-  - service: script.jeff_is_stationary

automations/jeff_home_leave.yaml

@@ -9,4 +9,3 @@ action:
     data:
       title: "Jarvis"
       message: "Jeff has left home"
-  - service: script.jeff_is_moving

automations/jeff_status_lost.yaml

@@ -0,0 +1,7 @@
+alias: "Jeff Status Lost"
+trigger:
+  platform: mqtt
+  topic: anchoragehouse/jeffrey/status
+  payload: 'unknown'
+action:
+  service: script.jeff_unknown

automations/jeff_status_moving.yaml

@@ -0,0 +1,7 @@
+alias: "Jeff Status Moving"
+trigger:
+  platform: mqtt
+  topic: anchoragehouse/jeffrey/status
+  payload: 'moving'
+action:
+  service: script.jeff_is_moving

automations/jeff_status_stationary.yaml

@@ -0,0 +1,7 @@
+alias: "Jeff Status Stationary"
+trigger:
+  platform: mqtt
+  topic: anchoragehouse/jeffrey/status
+  payload: 'stationary'
+action:
+  service: script.jeff_is_stationary

automations/jeff_status_unknown.yaml

@@ -1,16 +0,0 @@
-alias: "Jeff Arrives Home"
-trigger:
-#  platform: zone
-#  event: enter
-#  zone: zone.home
-#  entity_id: device_tracker.jeffreystonesiphone
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  # Optional
-  payload: 'unknown'
-action:
-  - service: notify.notify
-    data:
-      title: "Jarvis"
-      message: "Jeff has arrived home"
-  - service: script.jeff_unknown

automations/jeff_summit_enter.yaml

@@ -8,5 +8,4 @@ action:
   - service: notify.notify
     data:
       title: "Jarvis"
-      message: "Jeff has arrived at Summit"
+      message: "Jeff is arriving at Summit"
-  - service: script.jeff_is_stationary

automations/jeff_summit_leave.yaml

@@ -1,16 +1,11 @@
 alias: "Jeff Leaves Summit"
 trigger:
-#  platform: zone
+  platform: zone
-#  event: leave
+  event: leave
-#  zone: zone.summit
+  zone: zone.summit
-#  entity_id: device_tracker.jeffreystonesiphone
+  entity_id: device_tracker.jeffreystonesiphone
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  # Optional
-  payload: 'moving'
 action:
   - service: notify.notify
     data:
       title: "Jarvis"
       message: "Jeff has left summit"
-  - service: script.jeff_is_moving

automations/kat_home_enter.yaml

@@ -8,5 +8,4 @@ action:
   - service: notify.notify
     data:
       title: "Jarvis"
-      message: "Kat has arrived home"
+      message: "Kat is arriving home"
-  - service: script.kat_is_stationary

automations/kat_home_leave.yaml

@@ -9,4 +9,3 @@ action:
     data:
       title: "Jarvis"
       message: "Kat has left home"
-  - service: script.kat_unknown

scripts.yaml

@@ -6,6 +6,3 @@ outside_all_off: !include scripts/outside_all_off.yaml
 jeff_is_moving: !include scripts/jeff_is_moving.yaml
 jeff_is_stationary: !include scripts/jeff_is_stationary.yaml
 jeff_unknown: !include scripts/jeff_unknown.yaml
-kat_is_moving: !include scripts/kat_is_moving.yaml
-kat_is_stationary: !include scripts/kat_is_stationary.yaml
-kat_unknown: !include scripts/kat_unknown.yaml

scripts/kat_is_moving.yaml

@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Kat is Moving"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.kat_status
-    option: moving

scripts/kat_is_stationary.yaml

@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Kat is Stationary"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.kat_status
-    option: stationary

scripts/kat_unknown.yaml

@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Kat Status Unknown"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.kat_status
-    option: unknown