From 4eed332cf684407caa72f9b2d7e439f235ba7f49 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 7 Mar 2026 00:56:48 +0000
Subject: Remove more missed v3 compatibility code.

---
 modules/remove.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'modules/remove.cpp')

diff --git a/modules/remove.cpp b/modules/remove.cpp
index b19d1ed7a..0bcf897f5 100644
--- a/modules/remove.cpp
+++ b/modules/remove.cpp
@@ -53,10 +53,8 @@ public:
 
 	CmdResult Handle(User* user, const CommandBase::Params& parameters) override
 	{
-		// Keep compatibility with v3 servers by allowing them to send removes with the old order.
-		const auto neworder = IS_LOCAL(user) || ServerInstance->Channels.IsPrefix(parameters[0][0]);
-		const std::string& channame = parameters[neworder ? 0 : 1];
-		const std::string& username = parameters[neworder ? 1 : 0];
+		const std::string& channame = parameters[0];
+		const std::string& username = parameters[1];
 
 		/* Look up the user we're meant to be removing from the channel */
 		User* target;
-- 
cgit v1.3.1-10-gc9f91