diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/UserId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/UserId.py
index c5f697e..8f48a82 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/UserId.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/user/UserId.py
@@ -20,15 +20,11 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
 
-import os, pwd
-
+import os
 class UserId(object):
 
     def __init__(self, id = None):
-        if id is None:
-           self.id = pwd.getpwuid(os.getuid()).pw_name
-        else:
-           self.id = id
+        self.id = id
 
     def getId(self):
         return self.id
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
index d23e92b..58bc3f5 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
@@ -37,7 +37,6 @@
 import struct
 import socket
 import os
-import pwd
 import threading
 
 class WsId(object):
@@ -48,8 +47,6 @@ class WsId(object):
             self.networkId = str(struct.unpack('<L',socket.inet_aton(socket.gethostbyname(socket.gethostname())))[0])
         
         self.userName = userName
-        if userName is None:
-            self.userName = pwd.getpwuid(os.getuid()).pw_name
             
         self.progName = progName
         if progName is None:
@@ -102,4 +99,4 @@ class WsId(object):
         return s
     
     def __repr__(self):
-        return self.__str__()
\ No newline at end of file
+        return self.__str__()