diff --git a/scripts/base/protocols/smb/main.zeek b/scripts/base/protocols/smb/main.zeek
index c13b3399c4..ed129f8ce1 100644
--- a/scripts/base/protocols/smb/main.zeek
+++ b/scripts/base/protocols/smb/main.zeek
@@ -144,8 +144,6 @@ export {
 		fid_map      : table[count] of FileInfo  &optional;
 		## Tree map to retrieve tree information based on the tree ID.
 		tid_map      : table[count] of TreeInfo  &optional;
-		## User map to retrieve user name based on the user ID.
-		uid_map      : table[count] of string    &optional;
 		## Pipe map to retrieve UUID based on the file ID of a pipe.
 		pipe_map     : table[count] of string    &optional;
 
diff --git a/scripts/base/protocols/smb/smb1-main.zeek b/scripts/base/protocols/smb/smb1-main.zeek
index a72c401ccf..e489a5e4e3 100644
--- a/scripts/base/protocols/smb/smb1-main.zeek
+++ b/scripts/base/protocols/smb/smb1-main.zeek
@@ -14,7 +14,6 @@ event smb1_message(c: connection, hdr: SMB1::Header, is_orig: bool) &priority=5
 		local state: SMB::State;
 		state$fid_map = table();
 		state$tid_map = table();
-		state$uid_map = table();
 		state$pipe_map = table();
 		state$pending_cmds = table();
 		c$smb_state = state;
@@ -25,11 +24,6 @@ event smb1_message(c: connection, hdr: SMB1::Header, is_orig: bool) &priority=5
 	local uid = hdr$uid;
 	local mid = hdr$mid;
 
-	if ( uid in smb_state$uid_map )
-		{
-		smb_state$current_cmd$username = smb_state$uid_map[uid];
-		}
-
 	if ( tid !in smb_state$tid_map )
 		{
 		smb_state$tid_map[tid] = SMB::TreeInfo($uid=c$uid, $id=c$id);
diff --git a/scripts/base/protocols/smb/smb2-main.zeek b/scripts/base/protocols/smb/smb2-main.zeek
index bc0c68a41f..8ccaa2df84 100644
--- a/scripts/base/protocols/smb/smb2-main.zeek
+++ b/scripts/base/protocols/smb/smb2-main.zeek
@@ -18,7 +18,6 @@ event smb2_message(c: connection, hdr: SMB2::Header, is_orig: bool) &priority=5
 		local state: SMB::State;
 		state$fid_map = table();
 		state$tid_map = table();
-		state$uid_map = table();
 		state$pending_cmds = table();
 		state$pipe_map = table();
 		c$smb_state = state;