diff --git a/admin_dashboard.yaml b/admin_dashboard.yaml
index 7c71135..407f622 100644
--- a/admin_dashboard.yaml
+++ b/admin_dashboard.yaml
@@ -777,9 +777,6 @@ views:
                 name: Actual Asleep Time
               - entity: input_datetime.emma_awake_at
                 name: Actual Awake Time
-              - entity: input_boolean.emma_has_napped
-              - entity: input_datetime.emma_down_for_nap
-              - entity: input_datetime.emma_up_from_nap
               - entity: input_number.emma_bedtime_hours
                 name: Bedtime Hours
               - entity: input_boolean.emma_wakeup_override
@@ -871,14 +868,6 @@ views:
                   low = states('sensor.tonights_low_temp') | int %} {{
                   'Threshold Met' if low >= threshold else '' }}
                 name: Bedtime
-              - entity: input_number.emma_naptime_aircon_threshold
-                name: Naptime
-                secondary_info: >
-                  {% set threshold =
-                  states('input_number.emma_naptime_aircon_threshold') | int %}
-                  {% set low =
-                  state_attr('weather.iron_nerd_weather_station','temperature')
-                  | int %} {{ 'Threshold Met' if low >= threshold else '' }}
             show_header_toggle: false
             state_color: true
             title: Emma Bedroom Aircon
@@ -965,7 +954,6 @@ views:
               - entity: input_select.scheduled_climate_mode_master_bedroom_fan
               - entity: input_select.scheduled_climate_mode_kallen_fan
               - entity: input_select.scheduled_climate_mode_emma_aircon
-              - entity: input_select.naptime_climate_mode_emma_aircon
               - entity: input_boolean.master_bedroom_climate_override
               - entity: input_boolean.kallen_bedroom_climate_override
               - entity: input_boolean.emma_bedroom_climate_override