diff --git a/astron/dclass/united.dc b/astron/dclass/united.dc
index 3c9a91f3..f0275f74 100644
--- a/astron/dclass/united.dc
+++ b/astron/dclass/united.dc
@@ -1484,7 +1484,6 @@ dclass DistributedEstate : DistributedObject {
   string DcObjectType db;
   setEstateReady() broadcast;
   setClientReady() airecv clsend;
-  setEstateType(uint8 type = 0) required broadcast db;
   setClosestHouse(uint8) airecv clsend;
   setTreasureIds(uint32[]) broadcast ram;
   requestServerTime() airecv clsend;
diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py
index 697c0fb6..0c2418e2 100644
--- a/otp/distributed/DCClassImports.py
+++ b/otp/distributed/DCClassImports.py
@@ -2,7 +2,7 @@
 from pandac.PandaModules import *
 
 
-hashVal = 3611798738L
+hashVal = 877728986
 
 
 from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot
diff --git a/toontown/building/DistributedBoardingPartyAI.py b/toontown/building/DistributedBoardingPartyAI.py
index 6f74cc34..fde21ef9 100644
--- a/toontown/building/DistributedBoardingPartyAI.py
+++ b/toontown/building/DistributedBoardingPartyAI.py
@@ -217,9 +217,6 @@ class DistributedBoardingPartyAI(DistributedObjectAI.DistributedObjectAI, Boardi
                 elif inviterId in groupList[2]:
                     self.sendUpdate('postKickReject', [leaderId, inviterId, inviteeId])
         else:
-            # This seems like an odd thing for hackers to be abusing
-            # which tells me disney had a bug in boarding parties for a
-            # while... 
             if inviteeId in self.avIdDict:
                 self.notify.warning('inviter %s tried to invite %s who already exists in avIdDict.' % (inviterId, inviteeId))
                 self.air.writeServerEvent('suspicious: inviter', inviterId, ' tried to invite %s who already exists in the avIdDict.' % inviteeId)
diff --git a/toontown/chat/WhiteListData.py b/toontown/chat/WhiteListData.py
index cd7031ee..c617d9eb 100644
--- a/toontown/chat/WhiteListData.py
+++ b/toontown/chat/WhiteListData.py
@@ -12001,7 +12001,6 @@ WHITELIST = [
     'edgar',
     'edge',
     "edge's",
-    'edge-of-your-seat',
     'edged',
     'edger',
     'edges',
@@ -17663,7 +17662,6 @@ WHITELIST = [
     'hatchet',
     'hatchets',
     'hate',
-    'hatee-hatee-hatee-ho',
     'hates',
     'hath',
     'hating',
@@ -20203,7 +20201,6 @@ WHITELIST = [
     'joes',
     'joey',
     'joff',
-    'joff-tchoff-tchoffo-tchoffo-tchoff',
     'john',
     'johnny',
     "johnny's",
@@ -25267,7 +25264,6 @@ WHITELIST = [
     'peesy',
     'pegasus',
     'pegboard',
-    'pegboardnerdsgoingtogiveyoumore',
     'pegleg',
     'peglegfleet',
     'pelican',
@@ -28346,7 +28342,6 @@ WHITELIST = [
     'rill',
     'ring',
     "ring's",
-    'ring-ding-ding-ding-dingeringeding',
     'ringing',
     'rings',
     'rink',
@@ -29327,7 +29322,6 @@ WHITELIST = [
     'scrambled',
     'scrap',
     'scrap-metal',
-    'scrap-metal-recovery-talent',
     'scrapbook',
     'scrape',
     'scraped',
@@ -31982,7 +31976,6 @@ WHITELIST = [
     "sunshine's",
     'sunshines',
     'sunswept',
-    'suoicodilaipxecitsiligarfilacrepus',
     'sup',
     'supa-star',
     'super',
@@ -36187,7 +36180,7 @@ WHITELIST = [
     'wut',
     'wwod',
     'www.toonhq.org',
-    'www.toontownfellowship.com',
+    'www.toontownunited.com',
     "wyatt's",
     'wyda',
     'wynken',
@@ -36221,7 +36214,6 @@ WHITELIST = [
     'xpedition',
     'xpend',
     'xpert',
-    'xpythonic',
     'xsentials',
     'xtra',
     'xtraordinary',
@@ -36755,4 +36747,6 @@ WHITELIST = [
     'zyyk',
     'zzz',
     'zzzzzs',
+    'denialmc',
+    'loudrob'
 ]
\ No newline at end of file
diff --git a/toontown/estate/DistributedEstate.py b/toontown/estate/DistributedEstate.py
index 3f0ad9f7..90a1d899 100644
--- a/toontown/estate/DistributedEstate.py
+++ b/toontown/estate/DistributedEstate.py
@@ -178,9 +178,6 @@ class DistributedEstate(DistributedObject.DistributedObject):
         initCamPos = VBase3(0, -10, 5)
         initCamHpr = VBase3(0, -10, 0)
 
-    def setEstateType(self, index):
-        self.estateType = index
-
     def setHouseInfo(self, houseInfo):
         self.notify.debug('setHouseInfo')
         houseType, housePos = cPickle.loads(houseInfo)
diff --git a/toontown/estate/DistributedEstateAI.py b/toontown/estate/DistributedEstateAI.py
index 11b29ac6..14e8437b 100644
--- a/toontown/estate/DistributedEstateAI.py
+++ b/toontown/estate/DistributedEstateAI.py
@@ -20,7 +20,6 @@ class DistributedEstateAI(DistributedObjectAI):
         self.toons = [0, 0, 0, 0, 0, 0]
         self.items = [[], [], [], [], [], []]
         self.decorData = []
-        self.estateType = 0 # NOT SURE IF THIS HAS ANY USE BUT THANKS DISNEY
         self.cloudType = 0
         self.dawnTime = 0
         self.lastEpochTimestamp = 0
@@ -97,19 +96,6 @@ class DistributedEstateAI(DistributedObjectAI):
 
     def setClientReady(self):
         self.sendUpdate('setEstateReady', [])
-
-    def setEstateType(self, type):
-        self.estateType = type
-        
-    def d_setEstateType(self, type):
-        self.sendUpdate('setEstateType', [type])
-        
-    def b_setEstateType(self, type):
-        self.setEstateType(type)
-        self.d_setEstateType(type)
-
-    def getEstateType(self):
-        return self.estateType
         
     def setClosestHouse(self, todo0):
         pass
diff --git a/toontown/toon/DistributedNPCFishermanAI.py b/toontown/toon/DistributedNPCFishermanAI.py
index a955e7c6..64a84454 100644
--- a/toontown/toon/DistributedNPCFishermanAI.py
+++ b/toontown/toon/DistributedNPCFishermanAI.py
@@ -72,8 +72,6 @@ class DistributedNPCFishermanAI(DistributedNPCToonBaseAI):
         if sell:
             av = simbase.air.doId2do.get(avId)
             if av:
-
-                #maybe: recreate Disney-style fishManager that does the above code?
                 trophyResult = self.air.fishManager.creditFishTank(av)
                 if trophyResult:
                     movieType = NPCToons.SELL_MOVIE_TROPHY
diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py
index db52e443..da34b5c8 100644
--- a/toontown/toonbase/TTLocalizerEnglish.py
+++ b/toontown/toonbase/TTLocalizerEnglish.py
@@ -2052,7 +2052,6 @@ ToonHealJokes = [['What goes TICK-TICK-TICK-WOOF?', 'A watchdog! '],
  ['What did the hat say to the scarf?', 'You hang around while I go on a head.'],
  ["What's the best parting gift?", 'A comb.'],
  ['What kind of cats like to go bowling?', 'Alley cats.'],
- ["What's wrong if you keep seeing talking animals?", "You're having Disney spells."],
  ['What did one eye say to the other?', 'Between you and me, something smells.'],
  ["What's round, white and giggles?", 'A tickled onion.'],
  ['What do you get when you cross Bambi with a ghost?', 'Bamboo.'],