diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml
index a8198e8e..65a3dfd1 100755
--- a/automation/sunrise_turnon_and_off.yaml
+++ b/automation/sunrise_turnon_and_off.yaml
@@ -33,8 +33,7 @@
     - service: light.turn_off
       entity_id: group.all_lights    
     - service: script.interior_off
-    - delay: '00:01:00'
-    - service: script.switch_turn_off_all
+
     
       
     
diff --git a/script/interior_off.yaml b/script/interior_off.yaml
index 5403b4f1..9fb9b5f1 100755
--- a/script/interior_off.yaml
+++ b/script/interior_off.yaml
@@ -1,35 +1,16 @@
-######################################################################################################
-###Script to shut switches with a 30 second delay to not trample codes
-###  Sample Call
-#  action:
-#   - service: script.interior_off
-######################################################################################################
-
-interior_off:
-  sequence:
-    - service: light.turn_off
-      entity_id: 
-        - group.interior_lights
-    - service: switch.turn_off
-      entity_id: switch.kitchen_accents
-    - delay: '00:00:30'
-    - service: switch.turn_off
-      entity_id: switch.foyer_outlet
-    - delay: '00:00:30'
-    - service: switch.turn_off
-      entity_id: switch.living_room_outlet
-    - delay: '00:00:30'
-    - service: switch.turn_off
-      entity_id: switch.printer
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.garage_outlet
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.living_room_amp
-    - delay: '00:01:00'
-    - service: switch.turn_off
-      entity_id: switch.dining_room_outlet
-
-    
+######################################################################################################
+###Script to shut switches with a 30 second delay to not trample codes
+###  Sample Call
+#  action:
+#   - service: script.interior_off
+######################################################################################################
+
+interior_off:
+  sequence:
+    - service: light.turn_off
+      entity_id: 
+        - group.interior_lights
+    
+    - service: script.switch_turn_off    
+    
     
\ No newline at end of file