diff --git a/addons/sourcemod/scripting/include/chat-processor.inc b/addons/sourcemod/scripting/include/chat-processor.inc
index cd722bd6..00b13e39 100644
--- a/addons/sourcemod/scripting/include/chat-processor.inc
+++ b/addons/sourcemod/scripting/include/chat-processor.inc
@@ -61,7 +61,7 @@ forward Action CP_OnChatMessage(int& author, ArrayList recipients, char[] flagst
 forward void CP_OnChatMessagePost(int author, ArrayList recipients, const char[] flagstring, const char[] formatstring, const char[] name, const char[] message, bool processcolors, bool removecolors);
 
 #if !defined REQUIRE_PLUGIN
-public __pl_chat_processor_SetNTVOptional()
+public void __pl_chat_processor_SetNTVOptional()
 {
 	MarkNativeAsOptional("ChatProcessor_GetFlagFormatString");
 }
diff --git a/addons/sourcemod/scripting/shavit-chat.sp b/addons/sourcemod/scripting/shavit-chat.sp
index b4cbaf16..a3b0b88e 100644
--- a/addons/sourcemod/scripting/shavit-chat.sp
+++ b/addons/sourcemod/scripting/shavit-chat.sp
@@ -736,19 +736,6 @@ public Action CP_OnChatMessage(int &author, ArrayList recipients, char[] flagstr
 	PrintToServer("%N %s", author, flagstring);
 	#endif
 
-	bool allchat = (StrContains(flagstring, "_All") != -1);
-	int team = GetClientTeam(author);
-
-	recipients.Clear();
-
-	for(int i = 1; i <= MaxClients; i++)
-	{
-		if(i == author || (IsClientInGame(i) && (allchat || GetClientTeam(i) == team)))
-		{
-			recipients.Push(i);
-		}
-	}
-
 	removecolors = true;
 	processcolors = false;