diff --git a/toontown/catalog/CatalogScreen.py b/toontown/catalog/CatalogScreen.py
index cdad97c2..5e5a5fa7 100644
--- a/toontown/catalog/CatalogScreen.py
+++ b/toontown/catalog/CatalogScreen.py
@@ -91,17 +91,12 @@ class CatalogScreen(DirectFrame):
         taskMgr.doMethodLater(1.0, clarabelleGreeting, 'clarabelleGreeting')
         taskMgr.doMethodLater(12.0, clarabelleHelpText1, 'clarabelleHelpText1')
         if hasattr(self, 'giftToggle'):
-            self.giftToggle['state'] = DGG.DISABLED
-            self.giftToggle['text'] = TTLocalizer.CatalogGiftToggleWait
-        base.cr.deliveryManager.sendAck()
-        self.accept('DeliveryManagerAck', self.__handleUDack)
-        taskMgr.doMethodLater(10.0, self.__handleNoAck, 'ackTimeOut')
+            self.giftToggle['state'] = DGG.NORMAL
+            self.giftToggle['text'] = TTLocalizer.CatalogGiftToggleOn
 
     def hide(self):
         self.ignore('CatalogItemPurchaseRequest')
         self.ignore('CatalogItemGiftPurchaseRequest')
-        self.ignore('DeliveryManagerAck')
-        taskMgr.remove('ackTimeOut')
         self.ignore(localAvatar.uniqueName('moneyChange'))
         self.ignore(localAvatar.uniqueName('bankMoneyChange'))
         self.ignore(localAvatar.uniqueName('emblemsChange'))
@@ -1012,40 +1007,8 @@ class CatalogScreen(DirectFrame):
         return test
 
     def __makeFFlist(self):
-        for familyMember in base.cr.avList:
-            if familyMember.id != base.localAvatar.doId:
-                newFF = (familyMember.id, familyMember.name, NametagGlobals.CCNonPlayer)
-                self.ffList.append(newFF)
-
-        for friendPair in base.localAvatar.friendsList:
-            friendId, flags = friendPair
-            handle = base.cr.identifyFriend(friendId)
-            if handle and not self.checkFamily(friendId):
-                if hasattr(handle, 'getName'):
-                    colorCode = NametagGlobals.CCSpeedChat
-                    if flags & ToontownGlobals.FriendChat:
-                        colorCode = NametagGlobals.CCFreeChat
-                    newFF = (friendPair[0], handle.getName(), colorCode)
-                    self.ffList.append(newFF)
-                else:
-                    self.notify.warning('Bad Handle for getName in makeFFlist')
-
-        hasManager = hasattr(base.cr, 'playerFriendsManager')
-        if hasManager:
-            for avatarId in base.cr.playerFriendsManager.getAllOnlinePlayerAvatars():
-                handle = base.cr.playerFriendsManager.getAvHandleFromId(avatarId)
-                playerId = base.cr.playerFriendsManager.findPlayerIdFromAvId(avatarId)
-                playerInfo = base.cr.playerFriendsManager.getFriendInfo(playerId)
-                freeChat = playerInfo.understandableYesNo
-                if handle and not self.checkFamily(avatarId):
-                    if hasattr(handle, 'getName'):
-                        colorCode = NametagGlobals.CCSpeedChat
-                        if freeChat:
-                            colorCode = NametagGlobals.CCFreeChat
-                        newFF = (avatarId, handle.getName(), colorCode)
-                        self.ffList.append(newFF)
-                    else:
-                        self.notify.warning('Bad Handle for getName in makeFFlist')
+        for id, handle in base.cr.friendsMap.items():
+            self.ffList.append((id, handle.getName(), NametagGlobals.CCFreeChat))
 
     def __makeScrollList(self):
         for ff in self.ffList:
@@ -1127,14 +1090,4 @@ class CatalogScreen(DirectFrame):
             self.scrollList.hide()
             self.showEmblems()
             self.giftToggle['text'] = TTLocalizer.CatalogGiftToggleOff
-            self.update()
-
-    def __handleUDack(self, caller = None):
-        taskMgr.remove('ackTimeOut')
-        if hasattr(self, 'giftToggle') and self.giftToggle:
-            self.giftToggle['state'] = DGG.NORMAL
-            self.giftToggle['text'] = TTLocalizer.CatalogGiftToggleOff
-
-    def __handleNoAck(self, caller = None):
-        if hasattr(self, 'giftToggle') and self.giftToggle:
-            self.giftToggle['text'] = TTLocalizer.CatalogGiftToggleNoAck
+            self.update()
\ No newline at end of file
diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py
index fd9cbcdc..8d6140da 100644
--- a/toontown/toonbase/TTLocalizerEnglish.py
+++ b/toontown/toonbase/TTLocalizerEnglish.py
@@ -6800,8 +6800,6 @@ CatalogGiftFor = 'Buy Gift for:'
 CatalogGiftTo = 'To: %s'
 CatalogGiftToggleOn = 'Stop Gifting'
 CatalogGiftToggleOff = 'Buy Gifts'
-CatalogGiftToggleWait = 'Trying!...'
-CatalogGiftToggleNoAck = 'Unavailable'
 CatalogPurchaseItemAvailable = 'Congratulations on your new purchase!  You can start using it right away.'
 CatalogPurchaseGiftItemAvailable = 'Excellent!  %s can start using your gift right away.'
 CatalogPurchaseItemOnOrder = 'Congratulations! Your purchase will be delivered to your mailbox soon.'
diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py
index cfcf50f7..a5a7a304 100644
--- a/toontown/toonbase/ToonBase.py
+++ b/toontown/toonbase/ToonBase.py
@@ -215,7 +215,6 @@ class ToonBase(OTPBase.OTPBase):
         self.slowQuietZone = self.config.GetBool('slow-quiet-zone', 0)
         self.slowQuietZoneDelay = self.config.GetFloat('slow-quiet-zone-delay', 5)
         self.killInterestResponse = self.config.GetBool('kill-interest-response', 0)
-        self.forceSkipTutorial = self.config.GetBool('force-skip-tutorial', 0)
         tpMgr = TextPropertiesManager.getGlobalPtr()
         WLDisplay = TextProperties()
         WLDisplay.setSlant(0.3)