diff --git a/automation/mark_person_as_arrived.yaml b/automation/mark_person_as_arrived.yaml
deleted file mode 100644
index af8598f3..00000000
--- a/automation/mark_person_as_arrived.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-alias: Mark Person as just arrived
-trigger:
-  - platform: state
-    entity_id: person.kyle
-    from: 'not_home'
-    to: 'home'
-  - platform: state
-    entity_id: person.charlotte
-    from: 'not_home'
-    to: 'home'
-action:
-  - service: input_select.select_option
-    data_template:
-      entity_id: >
-        {% if trigger.entity_id == 'person.kyle' %}
-          input_select.kyle_status_dropdown
-        {% elif trigger.entity_id == 'person.charlotte' %}
-          input_select.charlotte_status_dropdown
-        {% endif %}
-      option: Just Arrived
-
-  - service: logbook.log
-    data_template:
-      name: EVENT
-      message: >
-        {{ trigger.to_state.attributes.friendly_name }} has just arrived at the house.
-
-  - service: script.tweet_engine
-    data_template:
-      tweet: >
-        {{ [ 
-        "Yay! Company!",
-        "A resident has just arrived!"
-         ] | random + " http://amzn.to/2D3J8jW" }}
-
-  - service: notify.twitter_thegordonhome
-    data:
-      message: "A resident has just arrived!"
-
diff --git a/automation/mark_person_as_away.yaml b/automation/mark_person_as_away.yaml
deleted file mode 100644
index bd6de4b9..00000000
--- a/automation/mark_person_as_away.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-alias: Mark Person as away
-trigger:
-  - platform: state
-    entity_id: input_select.kyle_status_dropdown
-    to: 'Just Left'
-    for:
-      minutes: 10
-  - platform: state
-    entity_id: input_select.charlotte_status_dropdown
-    to: 'Just Left'
-    for:
-      minutes: 10
-action:
-  - service: input_select.select_option
-    data_template:
-      entity_id: >
-        {% if trigger.entity_id == 'input_select.kyle_status_dropdown' %}
-          input_select.kyle_status_dropdown
-        {% else %}
-          input_select.charlotte_status_dropdown
-        {% endif %}
-      option: Away
-
-  - service: logbook.log
-    data_template:
-      name: EVENT
-      message: >
-        {% if trigger.entity_id == 'input_select.kyle_status_dropdown' %}
-          Kyle is now away
-        {% elif trigger.entity_id == 'input_select.charlotte_status_dropdown' %}
-          Charlotte is now away
-        {% endif %}
-
diff --git a/automation/mark_person_as_extended_away.yaml b/automation/mark_person_as_extended_away.yaml
deleted file mode 100644
index d0225a57..00000000
--- a/automation/mark_person_as_extended_away.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-alias: Mark Person as extended away
-trigger:
-  - platform: state
-    entity_id: input_select.kyle_status_dropdown
-    to: 'Away'
-    for:
-      hours: 24
-  - platform: state
-    entity_id: input_select.charlotte_status_dropdown
-    to: 'Away'
-    for:
-      hours: 24
-action:
-  - service: input_select.select_option
-    data_template:
-      entity_id: >
-        {% if trigger.entity_id == 'input_select.kyle_status_dropdown' %}
-          input_select.kyle_status_dropdown
-        {% else %}
-          input_select.charlotte_status_dropdown
-        {% endif %}
-      option: Extended Away
-
-  - service: logbook.log
-    data_template:
-      name: EVENT
-      message: >
-        {% if trigger.entity_id == 'input_select.kyle_status_dropdown' %}
-          Kyle has been away for an extended time.
-        {% elif trigger.entity_id == 'input_select.charlotte_status_dropdown' %}
-          Charlotte has been away for an extended time.
-        {% endif %}
-
diff --git a/automation/mark_person_as_home.yaml b/automation/mark_person_as_home.yaml
deleted file mode 100644
index f5114ad2..00000000
--- a/automation/mark_person_as_home.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-alias: Mark Person as home
-trigger:
-  - platform: state
-    entity_id: input_select.kyle_status_dropdown
-    to: 'Just Arrived'
-    for:
-      minutes: 10
-  - platform: state
-    entity_id: input_select.charlotte_status_dropdown
-    to: 'Just Arrived'
-    for:
-      minutes: 10
-  - platform: state
-    entity_id: input_select.kyle_status_dropdown
-    from: 'Just Left'
-    to: 'Just Arrived'
-  - platform: state
-    entity_id: input_select.charlotte_status_dropdown
-    from: 'Just Left'
-    to: 'Just Arrived'
-condition:
-action:
-  - service: input_select.select_option
-    data_template:
-      entity_id: >
-        {% if trigger.entity_id == 'input_select.kyle_status_dropdown' %}
-          input_select.kyle_status_dropdown
-        {% else %}
-          input_select.charlotte_status_dropdown
-        {% endif %}
-      option: Home
-
-  - service: logbook.log
-    data_template:
-      name: EVENT
-      message: >
-        {% if trigger.entity_id == 'input_select.kyle_status_dropdown' %}
-          Kyle is home!
-        {% elif trigger.entity_id == 'input_select.charlotte_status_dropdown' %}
-          Charlotte is home!
-        {% endif %}
-
diff --git a/automation/mark_person_as_just_left.yaml b/automation/mark_person_as_just_left.yaml
deleted file mode 100644
index aa7c3d76..00000000
--- a/automation/mark_person_as_just_left.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-alias: Mark Person as just left
-trigger:
-  - platform: state
-    entity_id: person.kyle
-    from: 'home'
-    to: 'not_home'
-  - platform: state
-    entity_id: person.charlotte
-    from: 'home'
-    to: 'not_home'
-  - platform: state
-    entity_id: person.kyle
-    from: 'home'
-    to: 'Kyle Work'
-  - platform: state
-    entity_id: person.charlotte
-    from: 'home'
-    to: 'Charlotte Work' 
-action:
-  - service: input_select.select_option
-    data_template:
-      entity_id: >
-        {% if trigger.entity_id == 'person.kyle' %}
-          input_select.kyle_status_dropdown
-        {% elif trigger.entity_id == 'person.charlotte' %}
-          input_select.charlotte_status_dropdown
-        {% endif %}
-      option: Just Left
-
-  - service: logbook.log
-    data_template:
-      name: EVENT
-      message: >
-        {{ trigger.to_state.attributes.friendly_name }} has just left the house.
-
diff --git a/groups.yaml b/groups.yaml
index 1e822b32..68d55049 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -3,7 +3,6 @@
 default_view:
   name: Home
   entities:
-    - group.people_status
     - group.modes
     - sensor.electricity_energy_usage
     - sensor.house_average_temperature
@@ -236,19 +235,10 @@ people:
   name: People
   icon: mdi:account-multiple
   entities:
-    - camera.kyle
-    - camera.charlotte
-    - sensor.charlotte_to_home
-    - sensor.charlotte_work_travel
-    - sensor.kyle_to_home
-    - sensor.kyle_work_travel
-    - input_select.kyle_status_dropdown
-    - input_select.charlotte_status_dropdown
-    - binary_sensor.kyle_driving
-    - binary_sensor.charlotte_driving
-    - device_tracker.bagpuss_a0001
-    - device_tracker.charlotte_thea
-    - device_tracker.ronnie_thea
+    - person.kyle
+    - person.charlotte
+    - person.ronnie
+    - person.eilean
 
 ## Item groups ##
 bedside_lights:
@@ -266,18 +256,6 @@ lightswitch_relays:
     - switch.craft_room_lightswitch_relay
     - switch.ensuite_lightswitch_relay
 
-people_status:
-  name: People Status
-  entities:
-    - sensor.kyle_status
-    - sensor.charlotte_status
-
-test:
-  name: Test
-  entities:
-    - switch.tellybox
-    - media_player.living_room_panasonic_tv
-
 other:
   name: Other
   entities:
diff --git a/input_select/charlotte_status_dropdown.yaml b/input_select/charlotte_status_dropdown.yaml
deleted file mode 100644
index 12f51b23..00000000
--- a/input_select/charlotte_status_dropdown.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Charlotte Status Dropdown
-options:
- - Driving
- - Standby
- - Sleeping
- - Home
- - Just Arrived
- - Just Left
- - Away
- - Extended Away
-initial: Home
diff --git a/input_select/kyle_status_dropdown.yaml b/input_select/kyle_status_dropdown.yaml
deleted file mode 100644
index af005ad8..00000000
--- a/input_select/kyle_status_dropdown.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Kyle Status Dropdown
-options:
- - Driving
- - Standby
- - Sleeping
- - Home
- - Just Arrived
- - Just Left
- - Away
- - Extended Away
-initial: Home