diff --git a/async_sheet_tools/gameoption_whitelist.yaml b/async_sheet_tools/gameoption_whitelist.yaml
index 7e91168..7fa40ae 100644
--- a/async_sheet_tools/gameoption_whitelist.yaml
+++ b/async_sheet_tools/gameoption_whitelist.yaml
@@ -2126,7 +2126,6 @@ Terraria:
     - Terraria
     - Locations
     - Name
-    - Calamity Mod Integration
     - Goal
     - Early Pre-Hardmode Achievements
     - Normal Achievements
diff --git a/games/Terraria.yaml b/games/Terraria.yaml
index 7f6710f..5b82172 100644
--- a/games/Terraria.yaml
+++ b/games/Terraria.yaml
@@ -1,12 +1,8 @@
 Terraria: 
-  # Calamity is a mod for Terraria that adds many more bosses to the game.
-  # Sorry, I was wrong. Calamity is actually in much higher demand than I thought.
-  calamity:
-    'false': 1
-    'true': 1
+  # Calamity has been disabled due to concerns regarding recent events.
+  calamity: 'false'
   # This is a very difficult secret seed in vanilla. It's probably too hard for a big async yaml.
   getfixedboi: 'false'
-  # Overridden via triggers if calamity is rolled
   goal:
     golem: 1
     moon_lord: 3
@@ -29,19 +25,7 @@
   death_link: 'false'
   # This is an awful location to check. If 200 fishing quests is considered "too grindy" for the big async, this isn't really any better.
   exclude_locations: And Good Riddance!
-  triggers:
-    # Calamity is longer than vanilla, with bosses that go past vanilla progression. This forces the goal to require defeating Post-Moon Lord bosses.
-    # Zenith is still a valid goal here, as Calamity changes its crafting recipe to require Yharon to be defeated.
-    - option_category: Terraria
-      option_name: calamity
-      option_result: 'true'
-      options:
-        Terraria:
-          goal:
-            yharon_dragon_of_rebirth: 1
-            zenith: 2
-            calamity_final_bosses: 3
-    
+  triggers:    
     # It doesn't make sense to have early or grindy achievements if normal achievements are disabled anyway.
     # This is identical to how it worked before.
     - option_category: Terraria