diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index b9f71c6dbb0..77cef557312 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -1566,9 +1566,6 @@ var/list/admin_datums = list()
 			C.update_admins(rank)
 			log_admin("[key_name(usr)] has made [C] a [rank]")
 			message_admins("[key_name_admin(usr)] has made [C] a [rank]", 1)
-//			admins[C.ckey] = rank
-//			admin_list |= C
-
 
 	if (href_list["object_list"])
 		if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index e44dfe6f8fd..ba1d7e5960a 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -162,24 +162,7 @@
 
 		message_admins("[usr] manually reloaded admins.txt")
 		usr << "You reload admins.txt"
-		var/text = file2text("config/admins.txt")
-		if (!text)
-			diary << "Failed to reload config/admins.txt\n"
-		else
-			var/list/lines = dd_text2list(text, "\n")
-			for(var/line in lines)
-				if (!line)
-					continue
-
-				if (copytext(line, 1, 2) == ";")
-					continue
-
-				var/pos = findtext(line, " - ", 1, null)
-				if (pos)
-					var/m_key = copytext(line, 1, pos)
-					var/a_lev = copytext(line, pos + 3, length(line) + 1)
-					admins[m_key] = a_lev
-					diary << ("ADMIN: [m_key] = [a_lev]")
+		world.load_admins()
 		feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index 73a44be1f7b..e7e2f239070 100644
--- a/code/modules/client/client defines.dm	
+++ b/code/modules/client/client defines.dm	
@@ -1,4 +1,3 @@
-//Some of this is being changed to a datum to cut down on uneccessary variables at the client level.	~Carn
 /client
 		////////////////
 		//ADMIN THINGS//
@@ -29,7 +28,6 @@
 	var/changes			= 0
 	var/area			= null
 	var/played			= 0
-	var/team			= null
 	var/be_alien		= 0		//Check if that guy wants to be an alien
 	var/be_pai			= 1		//Consider client when searching for players to recruit as a pAI
 	var/activeslot		= 1		//Default active slot!