diff --git a/apworld/Rules.py b/apworld/Rules.py
index c607bc6..754d93b 100644
--- a/apworld/Rules.py
+++ b/apworld/Rules.py
@@ -2522,8 +2522,9 @@ def rules(ultrakillworld):
         
 
     # 7-S
-    set_rule(multiworld.get_location("Cleared 7-S", player),
-        lambda state: grab_item(state, player, arm))
+    if secretcompletion:
+        set_rule(multiworld.get_location("Cleared 7-S", player),
+            lambda state: grab_item(state, player, arm))
     
     if clean:
         set_rule(multiworld.get_location("7-S: Cleaned Courtyard", player),
@@ -2538,8 +2539,9 @@ def rules(ultrakillworld):
             lambda state: grab_item(state, player, arm))
 
     if skulls:
-        add_rule(multiworld.get_location("Cleared 7-S", player),
-            lambda state: state.has_all({"Red Skull (7-S)", "Blue Skull (7-S)"}, player))
+        if secretcompletion:
+            add_rule(multiworld.get_location("Cleared 7-S", player),
+                lambda state: state.has_all({"Red Skull (7-S)", "Blue Skull (7-S)"}, player))
         
         if clean:
             add_rule(multiworld.get_location("7-S: Cleaned Courtyard", player),
diff --git a/apworld/__init__.py b/apworld/__init__.py
index cb2c590..13e6368 100644
--- a/apworld/__init__.py
+++ b/apworld/__init__.py
@@ -302,6 +302,8 @@ def create_regions(self):
                 continue
             elif "fish" in loc["game_id"] and not self.options.fish_rewards:
                 continue
+            elif "clean" in loc["game_id"] and not self.options.cleaning_rewards:
+                continue
             elif loc["name"] in limbo_switches and not self.options.randomize_limbo_switches:
                 continue
             elif loc["name"] in violence_switches and not self.options.randomize_violence_switches: