diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py
index 847c0d7657..32b2374fc5 100644
--- a/direct/src/distributed/DistributedObjectAI.py
+++ b/direct/src/distributed/DistributedObjectAI.py
@@ -340,10 +340,10 @@ class DistributedObjectAI(DistributedObjectBase):
             self.air.sendUpdate(self, fieldName, args)
 
     def GetPuppetConnectionChannel(self, doId):
-        return doId + (1001L << 32)
+        return doId + (1001 << 32)
 
     def GetAccountConnectionChannel(self, doId):
-        return doId + (1003L << 32)
+        return doId + (1003 << 32)
 
     def GetAccountIDFromChannelCode(self, channel):
         return channel >> 32
diff --git a/direct/src/distributed/DistributedObjectUD.py b/direct/src/distributed/DistributedObjectUD.py
index e9e717a557..99762cc1d3 100755
--- a/direct/src/distributed/DistributedObjectUD.py
+++ b/direct/src/distributed/DistributedObjectUD.py
@@ -270,10 +270,10 @@ class DistributedObjectUD(DistributedObjectBase):
             self.air.sendUpdate(self, fieldName, args)
 
     def GetPuppetConnectionChannel(self, doId):
-        return doId + (1001L << 32)
+        return doId + (1001 << 32)
 
     def GetAccountConnectionChannel(self, doId):
-        return doId + (1003L << 32)
+        return doId + (1003 << 32)
 
     def GetAccountIDFromChannelCode(self, channel):
         return channel >> 32
diff --git a/makepanda/test_imports.py b/makepanda/test_imports.py
index 290ec03e13..ecd87cbb66 100644
--- a/makepanda/test_imports.py
+++ b/makepanda/test_imports.py
@@ -98,7 +98,6 @@ import direct.distributed.InterestWatcher
 import direct.distributed.MsgTypes
 import direct.distributed.MsgTypesCMU
 import direct.distributed.NetMessenger
-import direct.distributed.OldClientRepository
 import direct.distributed.ParentMgr
 import direct.distributed.PyDatagram
 import direct.distributed.PyDatagramIterator