diff --git a/server/src/main/java/dev/plex/command/impl/BanCMD.java b/server/src/main/java/dev/plex/command/impl/BanCMD.java
index 440bc58..0cbd629 100644
--- a/server/src/main/java/dev/plex/command/impl/BanCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/BanCMD.java
@@ -12,8 +12,11 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
-import dev.plex.util.*;
-
+import dev.plex.util.BungeeUtil;
+import dev.plex.util.PlexLog;
+import dev.plex.util.PlexUtils;
+import dev.plex.util.TimeUtils;
+import dev.plex.util.WebUtils;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -98,12 +101,7 @@ public class BanCMD extends PlexCommand
             {
                 if (player != null)
                 {
-                    if (BungeeUtil.isBungeeCord() || BungeeUtil.isVelocity())
-                    {
-                        BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
-                    } else {
-                        player.kick(Punishment.generateBanMessage(punishment));
-                    }
+                    BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
                 }
             });
             PlexLog.debug("(From /ban command) PunishedPlayer UUID: " + plexPlayer.getUuid());
diff --git a/server/src/main/java/dev/plex/command/impl/KickCMD.java b/server/src/main/java/dev/plex/command/impl/KickCMD.java
index 2db291f..62f7ebf 100644
--- a/server/src/main/java/dev/plex/command/impl/KickCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/KickCMD.java
@@ -67,13 +67,7 @@ public class KickCMD extends PlexCommand
         punishment.setIp(player.getAddress().getAddress().getHostAddress().trim());
         plugin.getPunishmentManager().punish(plexPlayer, punishment);
         PlexUtils.broadcast(messageComponent("kickedPlayer", sender.getName(), plexPlayer.getName()));
-        if (BungeeUtil.isBungeeCord() || BungeeUtil.isVelocity())
-        {
-            BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
-        } else
-        {
-            player.kick(Punishment.generateBanMessage(punishment));
-        }
+        BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
         return null;
     }
 }
\ No newline at end of file
diff --git a/server/src/main/java/dev/plex/command/impl/TempbanCMD.java b/server/src/main/java/dev/plex/command/impl/TempbanCMD.java
index 2579d17..dc923df 100644
--- a/server/src/main/java/dev/plex/command/impl/TempbanCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/TempbanCMD.java
@@ -15,6 +15,8 @@ import dev.plex.util.BungeeUtil;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
 import dev.plex.util.WebUtils;
+import java.util.List;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
@@ -23,9 +25,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.UUID;
-
 @CommandParameters(name = "tempban", usage = "/<command> <player> <time> [reason]", description = "Temporarily ban a player")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.tempban", source = RequiredCommandSource.ANY)
 
@@ -73,7 +72,8 @@ public class TempbanCMD extends PlexCommand
         {
             reason = StringUtils.join(args, " ", 2, args.length);
             punishment.setReason(reason);
-        } else
+        }
+        else
         {
             punishment.setReason("No reason provided.");
         }
@@ -89,13 +89,7 @@ public class TempbanCMD extends PlexCommand
         PlexUtils.broadcast(messageComponent("banningPlayer", sender.getName(), plexPlayer.getName()));
         if (player != null)
         {
-            if (BungeeUtil.isBungeeCord() || BungeeUtil.isVelocity())
-            {
-                BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
-            } else
-            {
-                player.kick(Punishment.generateBanMessage(punishment));
-            }
+            BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
         }
         return null;
     }
diff --git a/server/src/main/java/dev/plex/util/BungeeUtil.java b/server/src/main/java/dev/plex/util/BungeeUtil.java
index fcc44df..cf53cd0 100644
--- a/server/src/main/java/dev/plex/util/BungeeUtil.java
+++ b/server/src/main/java/dev/plex/util/BungeeUtil.java
@@ -4,7 +4,6 @@ import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import dev.plex.Plex;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -23,10 +22,17 @@ public class BungeeUtil
 
     public static void kickPlayer(Player player, Component message)
     {
-        ByteArrayDataOutput out = ByteStreams.newDataOutput();
-        out.writeUTF("KickPlayer");
-        out.writeUTF(player.getName());
-        out.writeUTF(LegacyComponentSerializer.legacySection().serialize(message));
-        player.sendPluginMessage(Plex.get(), "BungeeCord", out.toByteArray());
+        if (isBungeeCord() || isVelocity())
+        {
+            ByteArrayDataOutput out = ByteStreams.newDataOutput();
+            out.writeUTF("KickPlayer");
+            out.writeUTF(player.getName());
+            out.writeUTF(LegacyComponentSerializer.legacySection().serialize(message));
+            player.sendPluginMessage(Plex.get(), "BungeeCord", out.toByteArray());
+        }
+        else
+        {
+            player.kick(message);
+        }
     }
 }