diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 890821e86e..49829fea88 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -395,9 +395,6 @@
 				if("ghost_interaction")
 					config.ghost_interaction = 1
 
-				if("simultaneous_pm_warning_timeout")
-					simultaneous_pm_warning_timeout = text2num(value) * 10
-
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index a321b9a7cd..3080f4d1bb 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -45,13 +45,13 @@
 		else		adminhelp(msg)	//admin we are replying to left. adminhelp instead
 		return
 
-	if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder)
+	/*if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder)
 		//send a warning to admins, but have a delay popup for mods
 		if(holder.rights & R_ADMIN)
 			src << "\red <b>Simultaneous PMs warning:</b> that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]"
 		else
 			if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel")
-				return
+				return*/
 
 	//get message text, limit it's length.and clean/escape html
 	if(!msg)
@@ -112,9 +112,9 @@
 	C << recieve_message
 	src << "<font color='blue'>[send_pm_type] PM to-<b>[key_name(C, src, 1)]</b>: [msg]</font>"
 
-	if(holder && !C.holder)
+	/*if(holder && !C.holder)
 		C.last_pm_recieved = world.time
-		C.ckey_last_pm = ckey
+		C.ckey_last_pm = ckey*/
 
 	//play the recieving admin the adminhelp sound (if they have them enabled)
 	//non-admins shouldn't be able to disable this
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index eec45594cd..2675436c33 100644
--- a/code/modules/client/client defines.dm	
+++ b/code/modules/client/client defines.dm	
@@ -8,9 +8,6 @@
 	var/last_message	= "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
 	var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
 
-	var/last_pm_recieved = 0	//world.time of the last PM this mob recieved, so that mods/admins recieve warnings if a player is getting spammed
-	var/ckey_last_pm = ""
-
 		/////////
 		//OTHER//
 		/////////
diff --git a/config/config.txt b/config/config.txt
index 66fa621209..a98daab842 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -213,7 +213,3 @@ ALIEN_PLAYER_RATIO 0.2
 
 ##Remove the # to let ghosts spin chairs
 #GHOST_INTERACTION
-
-#Seconds after a player recieves a PM that other admins will recieve warnings for trying to message
-SIMULTANEOUS_PM_WARNING_TIMEOUT 10
-