diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java
index 973cd35c..d483ae60 100644
--- a/src/engine/net/client/ClientMessagePump.java
+++ b/src/engine/net/client/ClientMessagePump.java
@@ -1863,8 +1863,6 @@ public class ClientMessagePump implements NetMsgHandler {
             return false;
         }
 
-        KeyCloneAudit.auditNetMsg(msg);
-
         ClientConnection origin;
         Protocol protocolMsg = Protocol.NONE;
         Session s;
@@ -1888,6 +1886,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
             switch (protocolMsg) {
                 case SETSELECTEDOBECT:
+                    KeyCloneAudit.auditTargetMsg(msg);
                     ClientMessagePump.targetObject((TargetObjectMsg) msg, origin);
                     break;
 
diff --git a/src/engine/util/KeyCloneAudit.java b/src/engine/util/KeyCloneAudit.java
index 999e2bb9..9307930e 100644
--- a/src/engine/util/KeyCloneAudit.java
+++ b/src/engine/util/KeyCloneAudit.java
@@ -1,7 +1,5 @@
 package engine.util;
 
-import engine.InterestManagement.WorldGrid;
-import engine.gameManager.ChatManager;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.SessionManager;
@@ -14,8 +12,6 @@ import engine.objects.PlayerCharacter;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
-import java.awt.image.ImageObserver;
-
 public enum KeyCloneAudit {
     KEYCLONEAUDIT;
 
@@ -38,42 +34,33 @@ public enum KeyCloneAudit {
 
     }
 
-    public static void auditNetMsg(ClientNetMsg msg) {
-        boolean valid = true;
+    public static void auditTargetMsg(ClientNetMsg msg) {
         try {
-            if (msg.getProtocolMsg().equals(Protocol.KEEPALIVESERVERCLIENT))
-                return;
-
+            TargetObjectMsg tarMsg = (TargetObjectMsg) msg;
             ClientConnection origin = (ClientConnection) msg.getOrigin();
             long now = System.currentTimeMillis();
-            PlayerCharacter pc = SessionManager.getSession(origin).getPlayerCharacter();
-            if (msg.getProtocolMsg().equals(Protocol.SETSELECTEDOBECT)) {
 
-                TargetObjectMsg tarMsg = (TargetObjectMsg)msg;
-                if(tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
-                    return;
+            if (tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
+                return;
 
-                if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
-                    origin.lastStrike = System.currentTimeMillis();
-                    origin.strikes = 0;
-                    origin.finalStrikes = 0;
-                    origin.finalStrikeRefresh = System.currentTimeMillis();
-                }
-                // Calculate time since last target switch
-                long timeSinceLastTarget = now - origin.lastTargetSwitchTime;
-                origin.lastTargetSwitchTime = now;
-                if (timeSinceLastTarget < 150) {
-                    origin.strikes++;
-                    origin.finalStrikeRefresh = System.currentTimeMillis() + 1000L;
-                }
-                if (origin.strikes > 20) {
-                    origin.finalStrikes++;
-                    //ChatManager.chatSystemInfo(pc, "Strike Received: " + origin.finalStrikes);
-                }
-                if (origin.finalStrikes > 3) {
-                    origin.forceDisconnect();
-                    DbManager.AccountQueries.SET_TRASH(origin.machineID);
-                }
+            if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
+                origin.lastStrike = System.currentTimeMillis();
+                origin.strikes = 0;
+                origin.finalStrikes = 0;
+                origin.finalStrikeRefresh = System.currentTimeMillis();
+            }
+            // Calculate time since last target switch
+            long timeSinceLastTarget = now - origin.lastTargetSwitchTime;
+            origin.lastTargetSwitchTime = now;
+            if (timeSinceLastTarget < 150) {
+                origin.strikes++;
+                origin.finalStrikeRefresh = System.currentTimeMillis() + 1000L;
+            }
+            if (origin.strikes > 20) {
+                origin.finalStrikes++;
+            }
+            if (origin.finalStrikes > 3) {origin.forceDisconnect();
+                DbManager.AccountQueries.SET_TRASH(origin.machineID);
             }
         } catch (Exception e) {