diff --git a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java
index 921ddf23..178657b0 100644
--- a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java
+++ b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java
@@ -53,21 +53,6 @@ public final class BungeePluginMessageUtils extends PluginMessageUtils implement
             return;
         }
 
-        UUID targetUuid = null;
-        String targetUsername = null;
-        Identity targetIdentity = Identity.UNKNOWN;
-
-        Connection target = event.getReceiver();
-        if (target instanceof ProxiedPlayer) {
-            ProxiedPlayer player = (ProxiedPlayer) target;
-            targetUuid = player.getUniqueId();
-            targetUsername = player.getName();
-            targetIdentity = Identity.PLAYER;
-
-        } else if (target instanceof ServerConnection) {
-            targetIdentity = Identity.SERVER;
-        }
-
         UUID sourceUuid = null;
         String sourceUsername = null;
         Identity sourceIdentity = Identity.UNKNOWN;
@@ -83,8 +68,9 @@ public final class BungeePluginMessageUtils extends PluginMessageUtils implement
             sourceIdentity = Identity.SERVER;
         }
 
-        Result result = channel.handleProxyCall(event.getData(), targetUuid, targetUsername,
-                targetIdentity, sourceUuid, sourceUsername, sourceIdentity);
+        Result result = channel.handleProxyCall(
+                event.getData(), sourceUuid, sourceUsername, sourceIdentity
+        );
 
         event.setCancelled(!result.isAllowed());
 
diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java
index 28f8c068..067edd31 100644
--- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java
+++ b/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java
@@ -36,14 +36,12 @@ public interface PluginMessageChannel {
 
     Result handleProxyCall(
             byte[] data,
-            UUID targetUuid,
-            String targetUsername,
-            Identity targetIdentity,
             UUID sourceUuid,
             String sourceUsername,
-            Identity sourceIdentity);
+            Identity sourceIdentity
+    );
 
-    Result handleServerCall(byte[] data, UUID targetUuid, String targetUsername);
+    Result handleServerCall(byte[] data, UUID playerUuid, String playerUsername);
 
     @Getter
     @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java
index 9d48b732..b12ec325 100644
--- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java
+++ b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java
@@ -56,13 +56,10 @@ public class FormChannel implements PluginMessageChannel {
     @Override
     public Result handleProxyCall(
             byte[] data,
-            UUID targetUuid,
-            String targetUsername,
-            Identity targetIdentity,
             UUID sourceUuid,
             String sourceUsername,
-            Identity sourceIdentity) {
-
+            Identity sourceIdentity
+    ) {
         if (sourceIdentity == Identity.SERVER) {
             // send it to the client
             return Result.forward();
@@ -89,7 +86,7 @@ public class FormChannel implements PluginMessageChannel {
     }
 
     @Override
-    public Result handleServerCall(byte[] data, UUID targetUuid, String targetUsername) {
+    public Result handleServerCall(byte[] data, UUID playerUuid, String playerUsername) {
         callResponseConsumer(data);
         return Result.handled();
     }
diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
index a6da65c5..2296f35e 100644
--- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
+++ b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
@@ -40,23 +40,26 @@ public final class PacketChannel implements PluginMessageChannel {
     }
 
     @Override
-    public Result handleProxyCall(byte[] data, UUID targetUuid, String targetUsername,
-                                  Identity targetIdentity, UUID sourceUuid, String sourceUsername,
-                                  Identity sourceIdentity) {
+    public Result handleProxyCall(
+            byte[] data,
+            UUID sourceUuid,
+            String sourceUsername,
+            Identity sourceIdentity
+    ) {
         if (sourceIdentity == Identity.SERVER) {
             // send it to the client
             return Result.forward();
         }
 
         if (sourceIdentity == Identity.PLAYER) {
-            return handleServerCall(data, targetUuid, targetUsername);
+            return handleServerCall(data, sourceUuid, sourceUsername);
         }
 
         return Result.handled();
     }
 
     @Override
-    public Result handleServerCall(byte[] data, UUID targetUuid, String targetUsername) {
+    public Result handleServerCall(byte[] data, UUID playerUuid, String playerUsername) {
         return Result.kick("Cannot send packets from Geyser/Floodgate to Floodgate");
     }
 
diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
index 2e82eceb..8b5b0a2d 100644
--- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
+++ b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
@@ -51,16 +51,13 @@ public class SkinChannel implements PluginMessageChannel {
     @Override
     public Result handleProxyCall(
             byte[] data,
-            UUID targetUuid,
-            String targetUsername,
-            Identity targetIdentity,
             UUID sourceUuid,
             String sourceUsername,
-            Identity sourceIdentity) {
-
+            Identity sourceIdentity
+    ) {
         // we can only get skins from Geyser (client)
         if (sourceIdentity == Identity.PLAYER) {
-            Result result = handleServerCall(data, targetUuid, targetUsername);
+            Result result = handleServerCall(data, sourceUuid, sourceUsername);
             // aka translate 'handled' into 'forward' when send-floodgate-data is enabled
             if (!result.isAllowed() && result.getReason() == null) {
                 if (config.isProxy() && ((ProxyFloodgateConfig) config).isSendFloodgateData()) {
@@ -78,8 +75,8 @@ public class SkinChannel implements PluginMessageChannel {
     }
 
     @Override
-    public Result handleServerCall(byte[] data, UUID targetUuid, String targetUsername) {
-        FloodgatePlayer floodgatePlayer = api.getPlayer(targetUuid);
+    public Result handleServerCall(byte[] data, UUID playerUuid, String playerUsername) {
+        FloodgatePlayer floodgatePlayer = api.getPlayer(playerUuid);
         if (floodgatePlayer == null) {
             return Result.kick("Player sent skins data for a non-Floodgate player");
         }
diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java
index 94e9982e..7ca754ed 100644
--- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java
+++ b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java
@@ -42,27 +42,24 @@ public class TransferChannel implements PluginMessageChannel {
     @Override
     public Result handleProxyCall(
             byte[] data,
-            UUID targetUuid,
-            String targetUsername,
-            Identity targetIdentity,
             UUID sourceUuid,
             String sourceUsername,
-            Identity sourceIdentity) {
-
+            Identity sourceIdentity
+    ) {
         if (sourceIdentity == Identity.SERVER) {
             // send it to the client
             return Result.forward();
         }
 
         if (sourceIdentity == Identity.PLAYER) {
-            handleServerCall(data, targetUuid, targetUsername);
+            handleServerCall(data, sourceUuid, sourceUsername);
         }
 
         return Result.handled();
     }
 
     @Override
-    public Result handleServerCall(byte[] data, UUID targetUuid, String targetUsername) {
+    public Result handleServerCall(byte[] data, UUID playerUuid, String playerUsername) {
         return Result.kick("I'm sorry, I'm unable to transfer a server :(");
     }
 
diff --git a/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java b/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java
index 482e5712..f6a8b75f 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java
@@ -33,7 +33,6 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
-import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
 import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import java.util.UUID;
@@ -64,21 +63,6 @@ public class VelocityPluginMessageUtils extends PluginMessageUtils {
             return;
         }
 
-        UUID targetUuid = null;
-        String targetUsername = null;
-        Identity targetIdentity = Identity.UNKNOWN;
-
-        ChannelMessageSink target = event.getTarget();
-        if (target instanceof Player) {
-            Player player = (Player) target;
-            targetUuid = player.getUniqueId();
-            targetUsername = player.getUsername();
-            targetIdentity = Identity.PLAYER;
-
-        } else if (target instanceof ServerConnection) {
-            targetIdentity = Identity.SERVER;
-        }
-
         UUID sourceUuid = null;
         String sourceUsername = null;
         Identity sourceIdentity = Identity.UNKNOWN;
@@ -94,8 +78,9 @@ public class VelocityPluginMessageUtils extends PluginMessageUtils {
             sourceIdentity = Identity.SERVER;
         }
 
-        Result result = channel.handleProxyCall(event.getData(), targetUuid, targetUsername,
-                targetIdentity, sourceUuid, sourceUsername, sourceIdentity);
+        Result result = channel.handleProxyCall(
+                event.getData(), sourceUuid, sourceUsername, sourceIdentity
+        );
 
         event.setResult(result.isAllowed() ? ForwardResult.forward() : ForwardResult.handled());