diff --git a/dependencies/astron/dclass/stride.dc b/dependencies/astron/dclass/stride.dc
index 1d3199a8..523a115b 100644
--- a/dependencies/astron/dclass/stride.dc
+++ b/dependencies/astron/dclass/stride.dc
@@ -334,7 +334,6 @@ from toontown.ai import DistributedReportMgr/AI
 from toontown.ai import DistributedPolarPlaceEffectMgr/AI
 from toontown.ai import DistributedEffectMgr/AI
 from toontown.ai import DistributedResistanceEmoteMgr/AI
-from toontown.ai import DistributedScavengerHuntTarget/AI
 from toontown.ai import DistributedTrickOrTreatTarget/AI
 from toontown.ai import DistributedWinterCarolingTarget/AI
 from toontown.coghq import DistributedMint/AI
@@ -2440,10 +2439,6 @@ dclass DistributedResistanceEmoteMgr : DistributedObject {
   addResistanceEmote() clsend airecv;
 };
 
-dclass DistributedScavengerHuntTarget : DistributedObject {
-  attemptScavengerHunt() airecv clsend;
-};
-
 dclass DistributedTrickOrTreatTarget : DistributedObject {
   doScavengerHunt(int8);
   requestScavengerHunt() airecv clsend;
diff --git a/toontown/ai/DistributedEffectMgr.py b/toontown/ai/DistributedEffectMgr.py
index 7af5c548..11755f38 100644
--- a/toontown/ai/DistributedEffectMgr.py
+++ b/toontown/ai/DistributedEffectMgr.py
@@ -10,7 +10,6 @@ class DistributedEffectMgr(DistributedObject):
 
     def setHoliday(self, holiday):
         self.holiday = holiday
-        print 'holiday is %s' % self.holiday
         self.accept(SpeedChatGlobals.SCStaticTextMsgEvent, self.__saidPhrase)
 
     def __saidPhrase(self, phraseId):
@@ -19,7 +18,7 @@ class DistributedEffectMgr(DistributedObject):
 
         holidayInfo = HolidayGlobals.getHoliday(self.holiday)
 
-        if 'speedchatIndex' not in holidayInfo or phraseId != holidayInfo['speedchatIndex']:
+        if 'speedchatIndexes' not in holidayInfo or phraseId not in holidayInfo['speedchatIndexes']:
             return
 
         self.sendUpdate('addEffect')
diff --git a/toontown/ai/DistributedScavengerHuntTarget.py b/toontown/ai/DistributedScavengerHuntTarget.py
deleted file mode 100755
index 3406e2a2..00000000
--- a/toontown/ai/DistributedScavengerHuntTarget.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed import DistributedObject
-from otp.speedchat import SpeedChatGlobals
-
-class DistributedScavengerHuntTarget(DistributedObject.DistributedObject):
-    notify = DirectNotifyGlobal.directNotify.newCategory('DistributedScavengerHuntTarget')
-
-    def __init__(self, cr):
-        DistributedObject.DistributedObject.__init__(self, cr)
-
-    def setupListenerDetails(self):
-        self.triggered = False
-        self.triggerDelay = 15
-        self.accept(SpeedChatGlobals.SCCustomMsgEvent, self.phraseSaid)
-
-    def phraseSaid(self, phraseId):
-        self.notify.debug('Checking if phrase was said')
-        helpPhrase = 10003
-
-        def reset():
-            self.triggered = False
-
-        if phraseId == helpPhrase and not self.triggered:
-            self.triggered = True
-            self.attemptScavengerHunt()
-            taskMgr.doMethodLater(self.triggerDelay, reset, 'ScavengerHunt-phrase-reset', extraArgs=[])
-
-    def announceGenerate(self):
-        DistributedObject.DistributedObject.announceGenerate(self)
-        DistributedScavengerHuntTarget.notify.debug('announceGenerate')
-        self.setupListenerDetails()
-
-    def delete(self):
-        self.ignoreAll()
-        taskMgr.remove('ScavengerHunt-phrase-reset')
-        DistributedObject.DistributedObject.delete(self)
-
-    def attemptScavengerHunt(self):
-        DistributedScavengerHuntTarget.notify.debug('attempScavengerHunt')
-        self.sendUpdate('attemptScavengerHunt', [])
diff --git a/toontown/ai/DistributedScavengerHuntTargetAI.py b/toontown/ai/DistributedScavengerHuntTargetAI.py
deleted file mode 100755
index 168ee9e4..00000000
--- a/toontown/ai/DistributedScavengerHuntTargetAI.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from direct.directnotify import DirectNotifyGlobal
-from direct.distributed.DistributedObjectAI import DistributedObjectAI
-
-class DistributedScavengerHuntTargetAI(DistributedObjectAI):
-    notify = DirectNotifyGlobal.directNotify.newCategory("DistributedScavengerHuntTargetAI")
-
-    def attemptScavengerHunt(self):
-        pass
diff --git a/toontown/ai/HolidayGlobals.py b/toontown/ai/HolidayGlobals.py
index a4a1bc66..b27a380f 100644
--- a/toontown/ai/HolidayGlobals.py
+++ b/toontown/ai/HolidayGlobals.py
@@ -53,7 +53,7 @@ Holidays = {
         'startMessage': TTLocalizer.IdesOfMarchStart,
         'ongoingMessage': TTLocalizer.IdesOfMarchStart,
         'endMessage': TTLocalizer.IdesOfMarchEnd,
-        'speedchatIndex': 30450, # It's easy to be green!
+        'speedchatIndexes': [30450], # It's easy to be green!
         'effectMessage': TTLocalizer.GreenToonEffectMsg
     }
 }