diff --git a/direct/src/distributed/AsyncRequest.py b/direct/src/distributed/AsyncRequest.py
index c6e52d537d..39921e1ab3 100755
--- a/direct/src/distributed/AsyncRequest.py
+++ b/direct/src/distributed/AsyncRequest.py
@@ -38,8 +38,7 @@ class AsyncRequest(DirectObject):
     """
     _asyncRequests = {}
 
-    if __debug__:
-        notify = DirectNotifyGlobal.directNotify.newCategory('AsyncRequest')
+    notify = DirectNotifyGlobal.directNotify.newCategory('AsyncRequest')
 
     def __init__(self, air, replyToChannelId = None,
                  timeoutTime = ASYNC_REQUEST_DEFAULT_TIMEOUT_IN_SECONDS,
diff --git a/direct/src/distributed/DistributedObjectGlobalAI.py b/direct/src/distributed/DistributedObjectGlobalAI.py
index ba93c688ab..cbd6c94d04 100755
--- a/direct/src/distributed/DistributedObjectGlobalAI.py
+++ b/direct/src/distributed/DistributedObjectGlobalAI.py
@@ -2,13 +2,9 @@
 from DistributedObjectAI import DistributedObjectAI
 from direct.directnotify.DirectNotifyGlobal import directNotify
 
-if __debug__:
-    notify = directNotify.newCategory('DistributedObjectGlobalAI')
-
 
 class DistributedObjectGlobalAI(DistributedObjectAI):
-    if __debug__:
-        notify = notify
+    notify = directNotify.newCategory('DistributedObjectGlobalAI')
 
     doNotDeallocateChannel = 1
     isGlobalDistObj = 1
@@ -33,4 +29,4 @@ class DistributedObjectGlobalAI(DistributedObjectAI):
        except AttributeError:
            self.air.unregisterForChannel(self.doId)
         ## self.air.removeDOFromTables(self)
- 
\ No newline at end of file
+ 
diff --git a/direct/src/distributed/DistributedObjectGlobalUD.py b/direct/src/distributed/DistributedObjectGlobalUD.py
index 4c3398170e..b860f8cf8f 100755
--- a/direct/src/distributed/DistributedObjectGlobalUD.py
+++ b/direct/src/distributed/DistributedObjectGlobalUD.py
@@ -3,13 +3,9 @@
 from DistributedObjectUD import DistributedObjectUD
 from direct.directnotify.DirectNotifyGlobal import directNotify
 
-if __debug__:
-    notify = directNotify.newCategory('DistributedObjectGlobalUD')
-
 
 class DistributedObjectGlobalUD(DistributedObjectUD):
-    if __debug__:
-        notify = notify
+    notify = directNotify.newCategory('DistributedObjectGlobalUD')
 
     doNotDeallocateChannel = 1
     isGlobalDistObj = 1
diff --git a/direct/src/distributed/NetMessenger.py b/direct/src/distributed/NetMessenger.py
index 83e3522bc6..0d24e2a1ff 100755
--- a/direct/src/distributed/NetMessenger.py
+++ b/direct/src/distributed/NetMessenger.py
@@ -32,8 +32,7 @@ class NetMessenger(Messenger):
     are sent over the network and (possibly) handled (accepted) on a
     remote machine (server).
     """
-    if __debug__:
-        notify = DirectNotifyGlobal.directNotify.newCategory('NetMessenger')
+    notify = DirectNotifyGlobal.directNotify.newCategory('NetMessenger')
 
     def __init__(self, air, channels):
         """
diff --git a/direct/src/fsm/FourState.py b/direct/src/fsm/FourState.py
index 49b2f02a3a..6f42046cef 100755
--- a/direct/src/fsm/FourState.py
+++ b/direct/src/fsm/FourState.py
@@ -43,9 +43,7 @@ class FourState:
     I found that this pattern repeated in several things I was
     working on, so this base class was created.
     """
-    if __debug__:
-        notify = DirectNotifyGlobal.directNotify.newCategory(
-                'FourState')
+    notify = DirectNotifyGlobal.directNotify.newCategory('FourState')
 
     def __init__(self, names, durations = [0, 1, None, 1, 1]):
         """
diff --git a/direct/src/fsm/FourStateAI.py b/direct/src/fsm/FourStateAI.py
index cf4b344ab6..d81d2bcf47 100755
--- a/direct/src/fsm/FourStateAI.py
+++ b/direct/src/fsm/FourStateAI.py
@@ -43,9 +43,7 @@ class FourStateAI:
     I found that this pattern repeated in several things I was
     working on, so this base class was created.
     """
-    if __debug__:
-        notify = DirectNotifyGlobal.directNotify.newCategory(
-                'FourStateAI')
+    notify = DirectNotifyGlobal.directNotify.newCategory('FourStateAI')
 
     def __init__(self, names, durations = [0, 1, None, 1, 1]):
         """
diff --git a/direct/src/http/webAIInspector.py b/direct/src/http/webAIInspector.py
index b16c20f7fa..d288d15874 100755
--- a/direct/src/http/webAIInspector.py
+++ b/direct/src/http/webAIInspector.py
@@ -8,7 +8,6 @@ The port will need to be defined when the instance is inited.
 
 import string, time, direct, inspect
 from operator import itemgetter
-from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.http import WebRequest
 from socket import gethostname
 from direct.task.Task import Task
@@ -22,9 +21,6 @@ if platform == 'win32':
 else:
     from linuxSystemInfo import SystemInformation
 
-if __debug__:
-    notify = directNotify.newCategory('AIWebInterface')
-
 class aiWebServer(SystemInformation):
     def __init__(self, air, listenPort=8080):
         SystemInformation.__init__(self)