diff --git a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
index e44fcbd8..00010919 100644
--- a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
@@ -22,7 +22,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
     // Instance variables
 
     public AbandonAssetMsgHandler() {
-        super(AbandonAssetMsg.class);
+        super();
 
     }
 
diff --git a/src/engine/net/client/handlers/AbstractChatMsgHandler.java b/src/engine/net/client/handlers/AbstractChatMsgHandler.java
index d1bba7e3..6dbfcd5f 100644
--- a/src/engine/net/client/handlers/AbstractChatMsgHandler.java
+++ b/src/engine/net/client/handlers/AbstractChatMsgHandler.java
@@ -22,7 +22,7 @@ import static engine.gameManager.ChatManager.FLOOD_TIME_THRESHOLD;
 public class AbstractChatMsgHandler extends AbstractClientMsgHandler {
 
     public AbstractChatMsgHandler() {
-        super(AbstractChatMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AbstractClientMsgHandler.java b/src/engine/net/client/handlers/AbstractClientMsgHandler.java
index d3045e3d..3af94513 100644
--- a/src/engine/net/client/handlers/AbstractClientMsgHandler.java
+++ b/src/engine/net/client/handlers/AbstractClientMsgHandler.java
@@ -10,10 +10,8 @@ import engine.net.client.msg.ClientNetMsg;
  */
 
 public abstract class AbstractClientMsgHandler {
-    private final Class<? extends ClientNetMsg> handler;
 
-    public AbstractClientMsgHandler(Class<? extends ClientNetMsg> handler) {
-        this.handler = handler;
+    public AbstractClientMsgHandler() {
     }
 
     public boolean handleNetMsg(ClientNetMsg msg) {
diff --git a/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java b/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java
index ce93f4cb..b1152980 100644
--- a/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java
+++ b/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java
@@ -32,7 +32,7 @@ import org.joda.time.DateTime;
 public class AcceptInviteToGuildHandler extends AbstractClientMsgHandler {
 
     public AcceptInviteToGuildHandler() {
-        super(AcceptInviteToGuildMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AcceptSubInviteHandler.java b/src/engine/net/client/handlers/AcceptSubInviteHandler.java
index def58428..90e1c5b0 100644
--- a/src/engine/net/client/handlers/AcceptSubInviteHandler.java
+++ b/src/engine/net/client/handlers/AcceptSubInviteHandler.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
 
     public AcceptSubInviteHandler() {
-        super(AcceptSubInviteMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java b/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java
index 83197728..274e897b 100644
--- a/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java
+++ b/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java
@@ -28,7 +28,7 @@ import static engine.objects.CharacterItemManager.canTrade;
 public class AcceptTradeRequestMsgHandler extends AbstractClientMsgHandler {
 
     public AcceptTradeRequestMsgHandler() {
-        super(AcceptTradeRequestMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java
index 67eefdd1..7cc842cf 100644
--- a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java
+++ b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
 
     public ActivateNPCMsgHandler() {
-        super(ActivateNPCMessage.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java b/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java
index 99bf6635..bbb01b21 100644
--- a/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java
+++ b/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java
@@ -27,7 +27,7 @@ import static engine.objects.CharacterItemManager.canTrade;
 public class AddGoldToTradeWindowMsgHandler extends AbstractClientMsgHandler {
 
     public AddGoldToTradeWindowMsgHandler() {
-        super(AddGoldToTradeWindowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java b/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java
index c5969a09..e2cc7d6c 100644
--- a/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java
+++ b/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java
@@ -25,7 +25,7 @@ import static engine.objects.CharacterItemManager.canTrade;
 public class AddItemToTradeWindowMsgHandler extends AbstractClientMsgHandler {
 
     public AddItemToTradeWindowMsgHandler() {
-        super(AddItemToTradeWindowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AllianceChangeMsgHandler.java b/src/engine/net/client/handlers/AllianceChangeMsgHandler.java
index 1089b95c..1b12f1af 100644
--- a/src/engine/net/client/handlers/AllianceChangeMsgHandler.java
+++ b/src/engine/net/client/handlers/AllianceChangeMsgHandler.java
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class AllianceChangeMsgHandler extends AbstractClientMsgHandler {
 
     public AllianceChangeMsgHandler() {
-        super(AllianceChangeMsg.class);
+        super();
     }
 
     private static void MakeEnemy(Guild fromGuild, Guild toGuild, AllianceChangeMsg msg, ClientConnection origin) {
diff --git a/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java b/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java
index 85ee8fac..1b4685ae 100644
--- a/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java
+++ b/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java
@@ -19,7 +19,7 @@ import engine.objects.PlayerCharacter;
 public class AllyEnemyListMsgHandler extends AbstractClientMsgHandler {
 
     public AllyEnemyListMsgHandler() {
-        super(AllyEnemyListMsg.class);
+        super();
     }
 
     private static void showAllyEnemyList(Guild fromGuild, Guild toGuild, AllyEnemyListMsg msg, ClientConnection origin) {
diff --git a/src/engine/net/client/handlers/AppointGroupLeaderHandler.java b/src/engine/net/client/handlers/AppointGroupLeaderHandler.java
index 8f5fa51b..22fdc3d3 100644
--- a/src/engine/net/client/handlers/AppointGroupLeaderHandler.java
+++ b/src/engine/net/client/handlers/AppointGroupLeaderHandler.java
@@ -26,7 +26,7 @@ import engine.objects.PlayerCharacter;
 public class AppointGroupLeaderHandler extends AbstractClientMsgHandler {
 
     public AppointGroupLeaderHandler() {
-        super(AppointGroupLeaderMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java b/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
index 3785211a..0ca789b2 100644
--- a/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
+++ b/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
@@ -8,7 +8,6 @@ import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.ArcLoginNotifyMsg;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.HotzoneChangeMsg;
 import engine.net.client.msg.PetMsg;
@@ -23,7 +22,7 @@ import org.pmw.tinylog.Logger;
 public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
 
     public ArcLoginNotifyMsgHandler() {
-        super(ArcLoginNotifyMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java b/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java
index ca12c32d..963863c2 100644
--- a/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java
+++ b/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler {
 
     public ArcMineChangeProductionMsgHandler() {
-        super(ArcMineChangeProductionMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java b/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java
index fa580286..3df45025 100644
--- a/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java
+++ b/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class ArcMineWindowAvailableTimeHandler extends AbstractClientMsgHandler {
 
     public ArcMineWindowAvailableTimeHandler() {
-        super(ArcMineWindowAvailableTimeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java b/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java
index 629d7a13..589cf9bb 100644
--- a/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java
+++ b/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java
@@ -20,7 +20,7 @@ import engine.objects.PlayerCharacter;
 public class ArcOwnedMinesListHandler extends AbstractClientMsgHandler {
 
     public ArcOwnedMinesListHandler() {
-        super(ArcOwnedMinesListMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java b/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java
index cd77faae..d47ff138 100644
--- a/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java
+++ b/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java
@@ -22,7 +22,7 @@ import org.pmw.tinylog.Logger;
 public class ArcSiegeSpireMsgHandler extends AbstractClientMsgHandler {
 
     public ArcSiegeSpireMsgHandler() {
-        super(ArcSiegeSpireMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java b/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java
index bf8b85c8..e1e7b431 100644
--- a/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java
+++ b/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java
@@ -23,7 +23,7 @@ import engine.objects.Warehouse;
 public class ArcViewAssetTransactionsMsgHandler extends AbstractClientMsgHandler {
 
     public ArcViewAssetTransactionsMsgHandler() {
-        super(ArcViewAssetTransactionsMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/AssetSupportMsgHandler.java b/src/engine/net/client/handlers/AssetSupportMsgHandler.java
index 24d9a028..145e0fd6 100644
--- a/src/engine/net/client/handlers/AssetSupportMsgHandler.java
+++ b/src/engine/net/client/handlers/AssetSupportMsgHandler.java
@@ -22,7 +22,7 @@ import org.pmw.tinylog.Logger;
 public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
 
     public AssetSupportMsgHandler() {
-        super(AssetSupportMsg.class);
+        super();
     }
 
     private static void protectAsset(AssetSupportMsg msg, Building targetBuilding, NPC vendor, ClientConnection origin) {
diff --git a/src/engine/net/client/handlers/AttackCmdMsgHandler.java b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
index afaaf22d..2fec2344 100644
--- a/src/engine/net/client/handlers/AttackCmdMsgHandler.java
+++ b/src/engine/net/client/handlers/AttackCmdMsgHandler.java
@@ -22,7 +22,7 @@ import engine.objects.PlayerCharacter;
 public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
 
     public AttackCmdMsgHandler() {
-        super(AttackCmdMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/BanishUnbanishHandler.java b/src/engine/net/client/handlers/BanishUnbanishHandler.java
index f25fbd5d..e9160929 100644
--- a/src/engine/net/client/handlers/BanishUnbanishHandler.java
+++ b/src/engine/net/client/handlers/BanishUnbanishHandler.java
@@ -31,7 +31,7 @@ import org.joda.time.DateTime;
 public class BanishUnbanishHandler extends AbstractClientMsgHandler {
 
     public BanishUnbanishHandler() {
-        super(BanishUnbanishMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/BreakFealtyHandler.java b/src/engine/net/client/handlers/BreakFealtyHandler.java
index 260ec640..81411b08 100644
--- a/src/engine/net/client/handlers/BreakFealtyHandler.java
+++ b/src/engine/net/client/handlers/BreakFealtyHandler.java
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
     public BreakFealtyHandler() {
-        super(BreakFealtyMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ChangeAltitudeHandler.java b/src/engine/net/client/handlers/ChangeAltitudeHandler.java
index cf526e06..11f2fe2a 100644
--- a/src/engine/net/client/handlers/ChangeAltitudeHandler.java
+++ b/src/engine/net/client/handlers/ChangeAltitudeHandler.java
@@ -25,7 +25,7 @@ import org.pmw.tinylog.Logger;
 public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
 
     public ChangeAltitudeHandler() {
-        super(ChangeAltitudeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java b/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java
index 6ebf4215..0726e8a7 100644
--- a/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java
+++ b/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java
@@ -29,7 +29,7 @@ import engine.objects.PlayerCharacter;
 public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
 
     public ChangeGuildLeaderHandler() {
-        super(ChangeGuildLeaderMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ChangeRankHandler.java b/src/engine/net/client/handlers/ChangeRankHandler.java
index c8cde3e2..29cda5e1 100644
--- a/src/engine/net/client/handlers/ChangeRankHandler.java
+++ b/src/engine/net/client/handlers/ChangeRankHandler.java
@@ -28,7 +28,7 @@ import engine.objects.PlayerCharacter;
 public class ChangeRankHandler extends AbstractClientMsgHandler {
 
     public ChangeRankHandler() {
-        super(ChangeRankMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ChannelMuteMsgHandler.java b/src/engine/net/client/handlers/ChannelMuteMsgHandler.java
index bd70d6f8..93a509b8 100644
--- a/src/engine/net/client/handlers/ChannelMuteMsgHandler.java
+++ b/src/engine/net/client/handlers/ChannelMuteMsgHandler.java
@@ -8,7 +8,6 @@ import engine.gameManager.ZoneManager;
 import engine.mbEnums.BuildingGroup;
 import engine.mbEnums.GuildState;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.ChatFilterMsg;
 import engine.net.client.msg.ClientNetMsg;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
@@ -23,7 +22,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler {
     // Instance variables
 
     public ChannelMuteMsgHandler() {
-        super(ChatFilterMsg.class);
+        super();
 
     }
 
diff --git a/src/engine/net/client/handlers/CityChoiceMsgHandler.java b/src/engine/net/client/handlers/CityChoiceMsgHandler.java
index 64a7fdf9..db4dde4e 100644
--- a/src/engine/net/client/handlers/CityChoiceMsgHandler.java
+++ b/src/engine/net/client/handlers/CityChoiceMsgHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class CityChoiceMsgHandler extends AbstractClientMsgHandler {
 
     public CityChoiceMsgHandler() {
-        super(CityChoiceMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/CityDataHandler.java b/src/engine/net/client/handlers/CityDataHandler.java
index 1766d74a..4848e6e4 100644
--- a/src/engine/net/client/handlers/CityDataHandler.java
+++ b/src/engine/net/client/handlers/CityDataHandler.java
@@ -25,7 +25,7 @@ import engine.session.Session;
 public class CityDataHandler extends AbstractClientMsgHandler {
 
     public CityDataHandler() {
-        super(CityDataMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ClaimAssetMsgHandler.java b/src/engine/net/client/handlers/ClaimAssetMsgHandler.java
index 460172a7..94ac6999 100644
--- a/src/engine/net/client/handlers/ClaimAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/ClaimAssetMsgHandler.java
@@ -39,7 +39,7 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
     private final ReentrantReadWriteLock claimLock = new ReentrantReadWriteLock();
 
     public ClaimAssetMsgHandler() {
-        super(ClaimAssetMsg.class);
+        super();
 
     }
 
diff --git a/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java b/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java
index 6b777c3c..0662a5e1 100644
--- a/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java
+++ b/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java
@@ -40,7 +40,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
     private final ReentrantReadWriteLock claimLock = new ReentrantReadWriteLock();
 
     public ClaimGuildTreeMsgHandler() {
-        super(ClaimGuildTreeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java b/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java
index efb4a0cb..5c62e843 100644
--- a/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java
+++ b/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java
@@ -25,7 +25,7 @@ import org.pmw.tinylog.Logger;
 public class ClientAdminCommandMsgHandler extends AbstractClientMsgHandler {
 
     public ClientAdminCommandMsgHandler() {
-        super(ClientAdminCommandMsg.class);
+        super();
     }
 
     public static boolean processDevCommand(AbstractWorldObject sender, String text) {
diff --git a/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java b/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java
index 53cb1779..da26e4c4 100644
--- a/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java
+++ b/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java
@@ -26,7 +26,7 @@ import org.pmw.tinylog.Logger;
 public class ClientLoginInfoMsgHandler extends AbstractClientMsgHandler {
 
     public ClientLoginInfoMsgHandler() {
-        super(ClientLoginInfoMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java b/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java
index 8252ff47..5d22651a 100644
--- a/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java
+++ b/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class CloseTradeWindowMsgHandler extends AbstractClientMsgHandler {
 
     public CloseTradeWindowMsgHandler() {
-        super(CloseTradeWindowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java b/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java
index 4deffdd9..319025b9 100644
--- a/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java
+++ b/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java
@@ -21,7 +21,7 @@ import org.pmw.tinylog.Logger;
 public class CommitNewCharacterMsgHandler extends AbstractClientMsgHandler {
 
     public CommitNewCharacterMsgHandler() {
-        super(CommitNewCharacterMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/CommitToTradeMsgHandler.java b/src/engine/net/client/handlers/CommitToTradeMsgHandler.java
index 81e890ae..fa38e74a 100644
--- a/src/engine/net/client/handlers/CommitToTradeMsgHandler.java
+++ b/src/engine/net/client/handlers/CommitToTradeMsgHandler.java
@@ -21,7 +21,7 @@ import static engine.objects.CharacterItemManager.canTrade;
 public class CommitToTradeMsgHandler extends AbstractClientMsgHandler {
 
     public CommitToTradeMsgHandler() {
-        super(CommitToTradeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java b/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java
index b45b2fa1..0dad25c3 100644
--- a/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java
+++ b/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java
@@ -23,7 +23,7 @@ import org.pmw.tinylog.Logger;
 public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler {
 
     public DeleteCharacterMsgHandler() {
-        super(DeleteCharacterMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DeleteItemMsgHandler.java b/src/engine/net/client/handlers/DeleteItemMsgHandler.java
index a9beb6db..b9cf6e2e 100644
--- a/src/engine/net/client/handlers/DeleteItemMsgHandler.java
+++ b/src/engine/net/client/handlers/DeleteItemMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -22,7 +22,7 @@ import engine.objects.PlayerCharacter;
 public class DeleteItemMsgHandler extends AbstractClientMsgHandler {
 
     public DeleteItemMsgHandler() {
-        super(DeleteItemMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DestroyBuildingHandler.java b/src/engine/net/client/handlers/DestroyBuildingHandler.java
index a4a6141c..dc42d6cb 100644
--- a/src/engine/net/client/handlers/DestroyBuildingHandler.java
+++ b/src/engine/net/client/handlers/DestroyBuildingHandler.java
@@ -20,7 +20,7 @@ import engine.objects.*;
 public class DestroyBuildingHandler extends AbstractClientMsgHandler {
 
     public DestroyBuildingHandler() {
-        super(DestroyBuildingMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DisbandGroupHandler.java b/src/engine/net/client/handlers/DisbandGroupHandler.java
index 7b0ca472..bc589418 100644
--- a/src/engine/net/client/handlers/DisbandGroupHandler.java
+++ b/src/engine/net/client/handlers/DisbandGroupHandler.java
@@ -14,7 +14,6 @@ import engine.gameManager.GroupManager;
 import engine.gameManager.SessionManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.group.DisbandGroupMsg;
 import engine.net.client.msg.group.GroupUpdateMsg;
 import engine.objects.Group;
 import engine.objects.PlayerCharacter;
@@ -22,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class DisbandGroupHandler extends AbstractClientMsgHandler {
 
     public DisbandGroupHandler() {
-        super(DisbandGroupMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DisbandGuildHandler.java b/src/engine/net/client/handlers/DisbandGuildHandler.java
index 44eea1ef..97620928 100644
--- a/src/engine/net/client/handlers/DisbandGuildHandler.java
+++ b/src/engine/net/client/handlers/DisbandGuildHandler.java
@@ -9,8 +9,6 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.GuildHistoryType;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.DataWarehouse;
 import engine.db.archive.GuildRecord;
@@ -18,12 +16,13 @@ import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.GuildHistoryType;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
-import engine.net.client.msg.guild.DisbandGuildMsg;
 import engine.net.client.msg.guild.LeaveGuildMsg;
 import engine.objects.Bane;
 import engine.objects.Guild;
@@ -33,7 +32,7 @@ import engine.objects.PlayerCharacter;
 public class DisbandGuildHandler extends AbstractClientMsgHandler {
 
     public DisbandGuildHandler() {
-        super(DisbandGuildMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DismissGuildHandler.java b/src/engine/net/client/handlers/DismissGuildHandler.java
index eae7167b..fe3f72c1 100644
--- a/src/engine/net/client/handlers/DismissGuildHandler.java
+++ b/src/engine/net/client/handlers/DismissGuildHandler.java
@@ -9,13 +9,13 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 public class DismissGuildHandler extends AbstractClientMsgHandler {
 
     public DismissGuildHandler() {
-        super(DismissGuildMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java b/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java
index c3403913..2dc62437 100644
--- a/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java
+++ b/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java
@@ -1,10 +1,10 @@
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DoorState;
 import engine.InterestManagement.WorldGrid;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
+import engine.mbEnums;
+import engine.mbEnums.DoorState;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -28,7 +28,7 @@ import java.util.HashSet;
 public class DoorTryOpenMsgHandler extends AbstractClientMsgHandler {
 
     public DoorTryOpenMsgHandler() {
-        super(DoorTryOpenMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/FormationFollowHandler.java b/src/engine/net/client/handlers/FormationFollowHandler.java
index ff78f996..263420a3 100644
--- a/src/engine/net/client/handlers/FormationFollowHandler.java
+++ b/src/engine/net/client/handlers/FormationFollowHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class FormationFollowHandler extends AbstractClientMsgHandler {
 
     public FormationFollowHandler() {
-        super(FormationFollowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/FriendAcceptHandler.java b/src/engine/net/client/handlers/FriendAcceptHandler.java
index 175e368f..a922857c 100644
--- a/src/engine/net/client/handlers/FriendAcceptHandler.java
+++ b/src/engine/net/client/handlers/FriendAcceptHandler.java
@@ -9,10 +9,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -26,7 +26,7 @@ import engine.objects.PlayerFriends;
 public class FriendAcceptHandler extends AbstractClientMsgHandler {
 
     public FriendAcceptHandler() {
-        super(AcceptFriendMsg.class);
+        super();
     }
 
     //change to Request
diff --git a/src/engine/net/client/handlers/FriendDeclineHandler.java b/src/engine/net/client/handlers/FriendDeclineHandler.java
index 35494d6f..1b72b132 100644
--- a/src/engine/net/client/handlers/FriendDeclineHandler.java
+++ b/src/engine/net/client/handlers/FriendDeclineHandler.java
@@ -9,9 +9,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class FriendDeclineHandler extends AbstractClientMsgHandler {
 
     public FriendDeclineHandler() {
-        super(DeclineFriendMsg.class);
+        super();
     }
 
     //change to Request
diff --git a/src/engine/net/client/handlers/FriendRequestHandler.java b/src/engine/net/client/handlers/FriendRequestHandler.java
index ad99abf1..6e600dd0 100644
--- a/src/engine/net/client/handlers/FriendRequestHandler.java
+++ b/src/engine/net/client/handlers/FriendRequestHandler.java
@@ -9,10 +9,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -24,7 +24,7 @@ import engine.objects.PlayerCharacter;
 public class FriendRequestHandler extends AbstractClientMsgHandler {
 
     public FriendRequestHandler() {
-        super(FriendRequestMsg.class);
+        super();
     }
 
     public static void HandleRequestFriend(PlayerCharacter player, FriendRequestMsg msg) {
diff --git a/src/engine/net/client/handlers/FurnitureHandler.java b/src/engine/net/client/handlers/FurnitureHandler.java
index a916dcb6..821377e2 100644
--- a/src/engine/net/client/handlers/FurnitureHandler.java
+++ b/src/engine/net/client/handlers/FurnitureHandler.java
@@ -9,8 +9,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class FurnitureHandler extends AbstractClientMsgHandler {
 
     public FurnitureHandler() {
-        super(FurnitureMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java b/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java
index 6ddf1fd2..ce8f4796 100644
--- a/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java
+++ b/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java
@@ -26,7 +26,7 @@ import org.pmw.tinylog.Logger;
 public class GameServerIPRequestMsgHandler extends AbstractClientMsgHandler {
 
     public GameServerIPRequestMsgHandler() {
-        super(GameServerIPRequestMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java b/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java
index 63bc4dc7..5a12150f 100644
--- a/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java
+++ b/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java
@@ -18,7 +18,7 @@ import engine.objects.PlayerCharacter;
 public class GoldFromVaultMsgHandler extends AbstractClientMsgHandler {
 
     public GoldFromVaultMsgHandler() {
-        super(GoldFromVaultMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GoldToVaultMsgHandler.java b/src/engine/net/client/handlers/GoldToVaultMsgHandler.java
index 7b75aaf4..caef99df 100644
--- a/src/engine/net/client/handlers/GoldToVaultMsgHandler.java
+++ b/src/engine/net/client/handlers/GoldToVaultMsgHandler.java
@@ -18,7 +18,7 @@ import engine.objects.PlayerCharacter;
 public class GoldToVaultMsgHandler extends AbstractClientMsgHandler {
 
     public GoldToVaultMsgHandler() {
-        super(GoldToVaultMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GroupInviteHandler.java b/src/engine/net/client/handlers/GroupInviteHandler.java
index a26c6566..a54f6be6 100644
--- a/src/engine/net/client/handlers/GroupInviteHandler.java
+++ b/src/engine/net/client/handlers/GroupInviteHandler.java
@@ -9,12 +9,12 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.exception.MsgSendException;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.GroupManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -28,7 +28,7 @@ import engine.objects.PlayerCharacter;
 public class GroupInviteHandler extends AbstractClientMsgHandler {
 
     public GroupInviteHandler() {
-        super(GroupInviteMsg.class);
+        super();
     }
 
     private static Group createGroup(PlayerCharacter pc, ClientConnection origin) {
diff --git a/src/engine/net/client/handlers/GroupInviteResponseHandler.java b/src/engine/net/client/handlers/GroupInviteResponseHandler.java
index baaf1fcf..0f5edd78 100644
--- a/src/engine/net/client/handlers/GroupInviteResponseHandler.java
+++ b/src/engine/net/client/handlers/GroupInviteResponseHandler.java
@@ -9,10 +9,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.GroupManager;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -29,7 +29,7 @@ import static engine.util.KeyCloneAudit.KEYCLONEAUDIT;
 public class GroupInviteResponseHandler extends AbstractClientMsgHandler {
 
     public GroupInviteResponseHandler() {
-        super(GroupInviteResponseMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GroupUpdateHandler.java b/src/engine/net/client/handlers/GroupUpdateHandler.java
index ad2a2d55..f3593b19 100644
--- a/src/engine/net/client/handlers/GroupUpdateHandler.java
+++ b/src/engine/net/client/handlers/GroupUpdateHandler.java
@@ -12,12 +12,11 @@ package engine.net.client.handlers;
 import engine.exception.MsgSendException;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.group.GroupUpdateMsg;
 
 public class GroupUpdateHandler extends AbstractClientMsgHandler {
 
     public GroupUpdateHandler() {
-        super(GroupUpdateMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildControlHandler.java b/src/engine/net/client/handlers/GuildControlHandler.java
index d0f2621b..d9f19313 100644
--- a/src/engine/net/client/handlers/GuildControlHandler.java
+++ b/src/engine/net/client/handlers/GuildControlHandler.java
@@ -9,9 +9,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -25,7 +25,7 @@ import engine.objects.PlayerCharacter;
 public class GuildControlHandler extends AbstractClientMsgHandler {
 
     public GuildControlHandler() {
-        super(GuildControlMsg.class);
+        super();
     }
 
     // TODO Don't think this protocolMsg (0x3235E5EA) is actually player history. so
diff --git a/src/engine/net/client/handlers/GuildCreationCloseHandler.java b/src/engine/net/client/handlers/GuildCreationCloseHandler.java
index 3b99b92a..955ddb06 100644
--- a/src/engine/net/client/handlers/GuildCreationCloseHandler.java
+++ b/src/engine/net/client/handlers/GuildCreationCloseHandler.java
@@ -12,12 +12,11 @@ package engine.net.client.handlers;
 import engine.exception.MsgSendException;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.guild.GuildCreationCloseMsg;
 
 public class GuildCreationCloseHandler extends AbstractClientMsgHandler {
 
     public GuildCreationCloseHandler() {
-        super(GuildCreationCloseMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java b/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
index 7860bd44..2d1a6f2e 100644
--- a/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
+++ b/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
@@ -34,7 +34,7 @@ import engine.util.StringUtils;
 public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
 
     public GuildCreationFinalizeHandler() {
-        super(GuildCreationFinalizeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildCreationOptionsHandler.java b/src/engine/net/client/handlers/GuildCreationOptionsHandler.java
index 986604e9..5a8cddc3 100644
--- a/src/engine/net/client/handlers/GuildCreationOptionsHandler.java
+++ b/src/engine/net/client/handlers/GuildCreationOptionsHandler.java
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class GuildCreationOptionsHandler extends AbstractClientMsgHandler {
 
     public GuildCreationOptionsHandler() {
-        super(GuildCreationOptionsMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildInfoHandler.java b/src/engine/net/client/handlers/GuildInfoHandler.java
index 3398f179..a253d7fd 100644
--- a/src/engine/net/client/handlers/GuildInfoHandler.java
+++ b/src/engine/net/client/handlers/GuildInfoHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class GuildInfoHandler extends AbstractClientMsgHandler {
 
     public GuildInfoHandler() {
-        super(GuildInfoMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildListHandler.java b/src/engine/net/client/handlers/GuildListHandler.java
index c3aea390..349d278a 100644
--- a/src/engine/net/client/handlers/GuildListHandler.java
+++ b/src/engine/net/client/handlers/GuildListHandler.java
@@ -12,12 +12,11 @@ package engine.net.client.handlers;
 import engine.exception.MsgSendException;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.guild.GuildListMsg;
 
 public class GuildListHandler extends AbstractClientMsgHandler {
 
     public GuildListHandler() {
-        super(GuildListMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java b/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java
index a0c0b37b..b20671bc 100644
--- a/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java
+++ b/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class GuildTreeStatusMsgHandler extends AbstractClientMsgHandler {
 
     public GuildTreeStatusMsgHandler() {
-        super(GuildTreeStatusMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/GuildUnknownHandler.java b/src/engine/net/client/handlers/GuildUnknownHandler.java
index 9657fa1d..ad0c8051 100644
--- a/src/engine/net/client/handlers/GuildUnknownHandler.java
+++ b/src/engine/net/client/handlers/GuildUnknownHandler.java
@@ -12,12 +12,11 @@ package engine.net.client.handlers;
 import engine.exception.MsgSendException;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.guild.GuildUnknownMsg;
 
 public class GuildUnknownHandler extends AbstractClientMsgHandler {
 
     public GuildUnknownHandler() {
-        super(GuildUnknownMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/HirelingServiceMsgHandler.java b/src/engine/net/client/handlers/HirelingServiceMsgHandler.java
index 7e13a724..167924c3 100644
--- a/src/engine/net/client/handlers/HirelingServiceMsgHandler.java
+++ b/src/engine/net/client/handlers/HirelingServiceMsgHandler.java
@@ -27,7 +27,7 @@ import engine.objects.PlayerCharacter;
 public class HirelingServiceMsgHandler extends AbstractClientMsgHandler {
 
     public HirelingServiceMsgHandler() {
-        super(HirelingServiceMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/IgnoreMsgHandler.java b/src/engine/net/client/handlers/IgnoreMsgHandler.java
index 34e0ee72..3b40cbd3 100644
--- a/src/engine/net/client/handlers/IgnoreMsgHandler.java
+++ b/src/engine/net/client/handlers/IgnoreMsgHandler.java
@@ -20,7 +20,7 @@ import engine.objects.PlayerCharacter;
 public class IgnoreMsgHandler extends AbstractClientMsgHandler {
 
     public IgnoreMsgHandler() {
-        super(IgnoreMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java b/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java
index 0951b8d4..fce42eba 100644
--- a/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java
+++ b/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java
@@ -20,7 +20,7 @@ import engine.objects.PlayerCharacter;
 public class InvalidTradeRequestMsgHandler extends AbstractClientMsgHandler {
 
     public InvalidTradeRequestMsgHandler() {
-        super(InvalidTradeRequestMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/InviteToGuildHandler.java b/src/engine/net/client/handlers/InviteToGuildHandler.java
index 79de3341..410b742a 100644
--- a/src/engine/net/client/handlers/InviteToGuildHandler.java
+++ b/src/engine/net/client/handlers/InviteToGuildHandler.java
@@ -30,7 +30,7 @@ import engine.objects.PlayerCharacter;
 public class InviteToGuildHandler extends AbstractClientMsgHandler {
 
     public InviteToGuildHandler() {
-        super(InviteToGuildMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/InviteToSubHandler.java b/src/engine/net/client/handlers/InviteToSubHandler.java
index 366df08f..c2f79c2d 100644
--- a/src/engine/net/client/handlers/InviteToSubHandler.java
+++ b/src/engine/net/client/handlers/InviteToSubHandler.java
@@ -29,7 +29,7 @@ import engine.objects.PlayerCharacter;
 public class InviteToSubHandler extends AbstractClientMsgHandler {
 
     public InviteToSubHandler() {
-        super(InviteToSubMsg.class);
+        super();
     }
 
     private static void sendChat(PlayerCharacter source, String msg) {
diff --git a/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java b/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java
index 3dbe99c3..678e046d 100644
--- a/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java
@@ -22,7 +22,7 @@ import engine.objects.PlayerCharacter;
 public class ItemFromVaultMsgHandler extends AbstractClientMsgHandler {
 
     public ItemFromVaultMsgHandler() {
-        super(ItemFromVaultMsg.class);
+        super();
     }
 
     //call this if the transfer fails server side to kick the item back to inventory from vault
diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
index f028efc3..0e7f2fbe 100644
--- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
@@ -37,7 +37,7 @@ import java.util.HashMap;
 public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
 
     public ItemProductionMsgHandler() {
-        super(ItemProductionMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ItemToVaultMsgHandler.java b/src/engine/net/client/handlers/ItemToVaultMsgHandler.java
index 3ea4a657..04a4e1f4 100644
--- a/src/engine/net/client/handlers/ItemToVaultMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemToVaultMsgHandler.java
@@ -22,7 +22,7 @@ import engine.objects.PlayerCharacter;
 public class ItemToVaultMsgHandler extends AbstractClientMsgHandler {
 
     public ItemToVaultMsgHandler() {
-        super(ItemToVaultMsg.class);
+        super();
     }
 
     //call this if the transfer fails server side to kick the item back to vault from inventory
diff --git a/src/engine/net/client/handlers/KeepAliveServerClientHandler.java b/src/engine/net/client/handlers/KeepAliveServerClientHandler.java
index 6f6c3568..da6eb347 100644
--- a/src/engine/net/client/handlers/KeepAliveServerClientHandler.java
+++ b/src/engine/net/client/handlers/KeepAliveServerClientHandler.java
@@ -20,7 +20,7 @@ import engine.objects.PlayerCharacter;
 public class KeepAliveServerClientHandler extends AbstractClientMsgHandler {
 
     public KeepAliveServerClientHandler() {
-        super(KeepAliveServerClientMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LeaveGroupHandler.java b/src/engine/net/client/handlers/LeaveGroupHandler.java
index 52fb7615..4797a660 100644
--- a/src/engine/net/client/handlers/LeaveGroupHandler.java
+++ b/src/engine/net/client/handlers/LeaveGroupHandler.java
@@ -13,12 +13,11 @@ import engine.exception.MsgSendException;
 import engine.gameManager.GroupManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.group.LeaveGroupMsg;
 
 public class LeaveGroupHandler extends AbstractClientMsgHandler {
 
     public LeaveGroupHandler() {
-        super(LeaveGroupMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LeaveGuildHandler.java b/src/engine/net/client/handlers/LeaveGuildHandler.java
index 5653cb11..029a76db 100644
--- a/src/engine/net/client/handlers/LeaveGuildHandler.java
+++ b/src/engine/net/client/handlers/LeaveGuildHandler.java
@@ -29,7 +29,7 @@ import engine.objects.PlayerCharacter;
 public class LeaveGuildHandler extends AbstractClientMsgHandler {
 
     public LeaveGuildHandler() {
-        super(LeaveGuildMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LeaveWorldMsgHandler.java b/src/engine/net/client/handlers/LeaveWorldMsgHandler.java
index af38f2c7..7efca5ab 100644
--- a/src/engine/net/client/handlers/LeaveWorldMsgHandler.java
+++ b/src/engine/net/client/handlers/LeaveWorldMsgHandler.java
@@ -11,12 +11,11 @@ package engine.net.client.handlers;
 import engine.exception.MsgSendException;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.LeaveWorldMsg;
 
 public class LeaveWorldMsgHandler extends AbstractClientMsgHandler {
 
     public LeaveWorldMsgHandler() {
-        super(LeaveWorldMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java b/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java
index afa03d2c..3f47245e 100644
--- a/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java
+++ b/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java
@@ -25,7 +25,7 @@ import org.pmw.tinylog.Logger;
 public class LockUnlockDoorMsgHandler extends AbstractClientMsgHandler {
 
     public LockUnlockDoorMsgHandler() {
-        super(LockUnlockDoorMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java b/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java
index 13144c86..1f973f34 100644
--- a/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java
+++ b/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java
@@ -26,7 +26,7 @@ import org.pmw.tinylog.Logger;
 public class LoginToGameServerMsgHandler extends AbstractClientMsgHandler {
 
     public LoginToGameServerMsgHandler() {
-        super(LoginToGameServerMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LootMsgHandler.java b/src/engine/net/client/handlers/LootMsgHandler.java
index 44882c2d..db9a1da0 100644
--- a/src/engine/net/client/handlers/LootMsgHandler.java
+++ b/src/engine/net/client/handlers/LootMsgHandler.java
@@ -26,7 +26,7 @@ import static engine.math.FastMath.sqr;
 public class LootMsgHandler extends AbstractClientMsgHandler {
 
     public LootMsgHandler() {
-        super(LootMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java b/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java
index 2f3d1247..e0384157 100644
--- a/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java
+++ b/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java
@@ -28,7 +28,7 @@ import static engine.math.FastMath.sqr;
 public class LootWindowRequestMsgHandler extends AbstractClientMsgHandler {
 
     public LootWindowRequestMsgHandler() {
-        super(LootWindowRequestMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/MOTDCommitHandler.java b/src/engine/net/client/handlers/MOTDCommitHandler.java
index ee509cb8..3af350a6 100644
--- a/src/engine/net/client/handlers/MOTDCommitHandler.java
+++ b/src/engine/net/client/handlers/MOTDCommitHandler.java
@@ -25,7 +25,7 @@ import engine.objects.PlayerCharacter;
 public class MOTDCommitHandler extends AbstractClientMsgHandler {
 
     public MOTDCommitHandler() {
-        super(MOTDCommitMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/MOTDEditHandler.java b/src/engine/net/client/handlers/MOTDEditHandler.java
index a5ee07e4..32640468 100644
--- a/src/engine/net/client/handlers/MOTDEditHandler.java
+++ b/src/engine/net/client/handlers/MOTDEditHandler.java
@@ -26,7 +26,7 @@ import engine.objects.PlayerCharacter;
 public class MOTDEditHandler extends AbstractClientMsgHandler {
 
     public MOTDEditHandler() {
-        super(MOTDMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java b/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java
index 739deab5..90b88b26 100644
--- a/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java
@@ -26,7 +26,7 @@ import org.joda.time.DateTime;
 public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
 
     public ManageCityAssetMsgHandler() {
-        super(ManageCityAssetsMsg.class);
+        super();
     }
 
     public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
diff --git a/src/engine/net/client/handlers/MerchantMsgHandler.java b/src/engine/net/client/handlers/MerchantMsgHandler.java
index 143240c3..e80227bb 100644
--- a/src/engine/net/client/handlers/MerchantMsgHandler.java
+++ b/src/engine/net/client/handlers/MerchantMsgHandler.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
     public MerchantMsgHandler() {
-        super(MerchantMsg.class);
+        super();
     }
 
     private static void requestSwearAsSubGuild(MerchantMsg msg, ClientConnection origin, PlayerCharacter player, NPC npc) {
diff --git a/src/engine/net/client/handlers/MineWindowChangeHandler.java b/src/engine/net/client/handlers/MineWindowChangeHandler.java
index c708ec53..1b3e66dc 100644
--- a/src/engine/net/client/handlers/MineWindowChangeHandler.java
+++ b/src/engine/net/client/handlers/MineWindowChangeHandler.java
@@ -35,7 +35,7 @@ import java.time.LocalDateTime;
 public class MineWindowChangeHandler extends AbstractClientMsgHandler {
 
     public MineWindowChangeHandler() {
-        super(ArcMineWindowChangeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/MinionTrainingMsgHandler.java b/src/engine/net/client/handlers/MinionTrainingMsgHandler.java
index 917d0201..b832db92 100644
--- a/src/engine/net/client/handlers/MinionTrainingMsgHandler.java
+++ b/src/engine/net/client/handlers/MinionTrainingMsgHandler.java
@@ -24,7 +24,7 @@ import org.pmw.tinylog.Logger;
 public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
     public MinionTrainingMsgHandler() {
-        super(MinionTrainingMessage.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ModifyStatMsgHandler.java b/src/engine/net/client/handlers/ModifyStatMsgHandler.java
index 00e82a79..c8001eda 100644
--- a/src/engine/net/client/handlers/ModifyStatMsgHandler.java
+++ b/src/engine/net/client/handlers/ModifyStatMsgHandler.java
@@ -18,7 +18,7 @@ import engine.server.MBServerStatics;
 public class ModifyStatMsgHandler extends AbstractClientMsgHandler {
 
     public ModifyStatMsgHandler() {
-        super(ModifyStatMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/MoveToPointHandler.java b/src/engine/net/client/handlers/MoveToPointHandler.java
index 83902e82..a1e3b077 100644
--- a/src/engine/net/client/handlers/MoveToPointHandler.java
+++ b/src/engine/net/client/handlers/MoveToPointHandler.java
@@ -19,7 +19,7 @@ import engine.objects.PlayerCharacter;
 public class MoveToPointHandler extends AbstractClientMsgHandler {
 
     public MoveToPointHandler() {
-        super(MoveToPointMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ObjectActionMsgHandler.java b/src/engine/net/client/handlers/ObjectActionMsgHandler.java
index 0e23dd32..1760e4fa 100644
--- a/src/engine/net/client/handlers/ObjectActionMsgHandler.java
+++ b/src/engine/net/client/handlers/ObjectActionMsgHandler.java
@@ -28,7 +28,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
     private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
     public ObjectActionMsgHandler() {
-        super(ObjectActionMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java b/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java
index 123d2390..1c4ef4ed 100644
--- a/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java
+++ b/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
 
     public OpenFriendsCondemnListMsgHandler() {
-        super(OpenFriendsCondemnListMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/OrderNPCMsgHandler.java b/src/engine/net/client/handlers/OrderNPCMsgHandler.java
index 7f798082..3c9ce110 100644
--- a/src/engine/net/client/handlers/OrderNPCMsgHandler.java
+++ b/src/engine/net/client/handlers/OrderNPCMsgHandler.java
@@ -33,7 +33,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
     private static final int SVR_CLOSE_WINDOW = 4;
 
     public OrderNPCMsgHandler() {
-        super(OrderNPCMsg.class);
+        super();
     }
 
     public static void processRedeedHireling(AbstractCharacter hireling, Building building, ClientConnection origin) {
diff --git a/src/engine/net/client/handlers/PerformActionMsgHandler.java b/src/engine/net/client/handlers/PerformActionMsgHandler.java
index f879960a..325bc3a6 100644
--- a/src/engine/net/client/handlers/PerformActionMsgHandler.java
+++ b/src/engine/net/client/handlers/PerformActionMsgHandler.java
@@ -17,7 +17,7 @@ import engine.net.client.msg.PerformActionMsg;
 public class PerformActionMsgHandler extends AbstractClientMsgHandler {
 
     public PerformActionMsgHandler() {
-        super(PerformActionMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/PetAttackMsgHandler.java b/src/engine/net/client/handlers/PetAttackMsgHandler.java
index b980e8fd..3a5a5d2f 100644
--- a/src/engine/net/client/handlers/PetAttackMsgHandler.java
+++ b/src/engine/net/client/handlers/PetAttackMsgHandler.java
@@ -20,7 +20,7 @@ import engine.objects.PlayerCharacter;
 public class PetAttackMsgHandler extends AbstractClientMsgHandler {
 
     public PetAttackMsgHandler() {
-        super(PetAttackMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/PetCmdMsgHandler.java b/src/engine/net/client/handlers/PetCmdMsgHandler.java
index 3dcf8e42..4413c9fd 100644
--- a/src/engine/net/client/handlers/PetCmdMsgHandler.java
+++ b/src/engine/net/client/handlers/PetCmdMsgHandler.java
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class PetCmdMsgHandler extends AbstractClientMsgHandler {
 
     public PetCmdMsgHandler() {
-        super(PetCmdMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java b/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java
index 602ee265..74d423cb 100644
--- a/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java
+++ b/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java
@@ -18,7 +18,7 @@ public class PetitionReceivedMsgHandler extends AbstractClientMsgHandler {
     public static final int PETITION_CLOSE = 4;
 
     public PetitionReceivedMsgHandler() {
-        super(PetitionReceivedMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java
index 5912493e..655941e2 100644
--- a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java
@@ -50,7 +50,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
     public PlaceAssetMsgHandler() {
 
-        super(PlaceAssetMsg.class);
+        super();
 
     }
 
diff --git a/src/engine/net/client/handlers/PromptRecallMsgHandler.java b/src/engine/net/client/handlers/PromptRecallMsgHandler.java
index 211fe877..7b52431a 100644
--- a/src/engine/net/client/handlers/PromptRecallMsgHandler.java
+++ b/src/engine/net/client/handlers/PromptRecallMsgHandler.java
@@ -23,7 +23,7 @@ import static engine.math.FastMath.sqr;
 public class PromptRecallMsgHandler extends AbstractClientMsgHandler {
 
     public PromptRecallMsgHandler() {
-        super(PromptRecallMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RandomMsgHandler.java b/src/engine/net/client/handlers/RandomMsgHandler.java
index 87c4beb8..a7f04123 100644
--- a/src/engine/net/client/handlers/RandomMsgHandler.java
+++ b/src/engine/net/client/handlers/RandomMsgHandler.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ThreadLocalRandom;
 public class RandomMsgHandler extends AbstractClientMsgHandler {
 
     public RandomMsgHandler() {
-        super(RandomMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RecommendNationMsgHandler.java b/src/engine/net/client/handlers/RecommendNationMsgHandler.java
index 3b169cc5..412020c9 100644
--- a/src/engine/net/client/handlers/RecommendNationMsgHandler.java
+++ b/src/engine/net/client/handlers/RecommendNationMsgHandler.java
@@ -20,7 +20,7 @@ import engine.objects.PlayerCharacter;
 public class RecommendNationMsgHandler extends AbstractClientMsgHandler {
 
     public RecommendNationMsgHandler() {
-        super(RecommendNationMsg.class);
+        super();
     }
 
     private static void RecommendNation(Guild fromGuild, Guild toGuild, RecommendNationMsg msg, ClientConnection origin) {
diff --git a/src/engine/net/client/handlers/RecvSummonsMsgHandler.java b/src/engine/net/client/handlers/RecvSummonsMsgHandler.java
index e1f6e303..41bfe313 100644
--- a/src/engine/net/client/handlers/RecvSummonsMsgHandler.java
+++ b/src/engine/net/client/handlers/RecvSummonsMsgHandler.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class RecvSummonsMsgHandler extends AbstractClientMsgHandler {
 
     public RecvSummonsMsgHandler() {
-        super(RecvSummonsMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RefineMsgHandler.java b/src/engine/net/client/handlers/RefineMsgHandler.java
index c1cdda76..8c690ae7 100644
--- a/src/engine/net/client/handlers/RefineMsgHandler.java
+++ b/src/engine/net/client/handlers/RefineMsgHandler.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class RefineMsgHandler extends AbstractClientMsgHandler {
 
     public RefineMsgHandler() {
-        super(RefineMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RefinerScreenMsgHandler.java b/src/engine/net/client/handlers/RefinerScreenMsgHandler.java
index 74bd90d9..94b1f1c2 100644
--- a/src/engine/net/client/handlers/RefinerScreenMsgHandler.java
+++ b/src/engine/net/client/handlers/RefinerScreenMsgHandler.java
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class RefinerScreenMsgHandler extends AbstractClientMsgHandler {
 
     public RefinerScreenMsgHandler() {
-        super(RefinerScreenMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RemoveFriendHandler.java b/src/engine/net/client/handlers/RemoveFriendHandler.java
index 4a59e7fb..d623e731 100644
--- a/src/engine/net/client/handlers/RemoveFriendHandler.java
+++ b/src/engine/net/client/handlers/RemoveFriendHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerFriends;
 public class RemoveFriendHandler extends AbstractClientMsgHandler {
 
     public RemoveFriendHandler() {
-        super(RemoveFriendMessage.class);
+        super();
     }
 
     public static void HandleRemoveFriend(PlayerCharacter player, RemoveFriendMessage msg) {
diff --git a/src/engine/net/client/handlers/RemoveFromGroupHandler.java b/src/engine/net/client/handlers/RemoveFromGroupHandler.java
index 784239c6..39d0ca1e 100644
--- a/src/engine/net/client/handlers/RemoveFromGroupHandler.java
+++ b/src/engine/net/client/handlers/RemoveFromGroupHandler.java
@@ -28,7 +28,7 @@ import java.util.Set;
 public class RemoveFromGroupHandler extends AbstractClientMsgHandler {
 
     public RemoveFromGroupHandler() {
-        super(RemoveFromGroupMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RepairBuildingMsgHandler.java b/src/engine/net/client/handlers/RepairBuildingMsgHandler.java
index b1271bb8..cb148455 100644
--- a/src/engine/net/client/handlers/RepairBuildingMsgHandler.java
+++ b/src/engine/net/client/handlers/RepairBuildingMsgHandler.java
@@ -22,7 +22,7 @@ import engine.objects.*;
 public class RepairBuildingMsgHandler extends AbstractClientMsgHandler {
 
     public RepairBuildingMsgHandler() {
-        super(RepairBuildingMsg.class);
+        super();
     }
 
     private static void RepairBuilding(Building targetBuilding, ClientConnection origin, RepairBuildingMsg msg) {
diff --git a/src/engine/net/client/handlers/RepairMsgHandler.java b/src/engine/net/client/handlers/RepairMsgHandler.java
index ffdcbb77..e44122a8 100644
--- a/src/engine/net/client/handlers/RepairMsgHandler.java
+++ b/src/engine/net/client/handlers/RepairMsgHandler.java
@@ -26,7 +26,7 @@ import engine.server.MBServerStatics;
 public class RepairMsgHandler extends AbstractClientMsgHandler {
 
     public RepairMsgHandler() {
-        super(RepairMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RequestBallListHandler.java b/src/engine/net/client/handlers/RequestBallListHandler.java
index aa206d64..62667f90 100644
--- a/src/engine/net/client/handlers/RequestBallListHandler.java
+++ b/src/engine/net/client/handlers/RequestBallListHandler.java
@@ -18,7 +18,7 @@ import engine.objects.PlayerCharacter;
 public class RequestBallListHandler extends AbstractClientMsgHandler {
 
     public RequestBallListHandler() {
-        super(RequestBallListMessage.class);
+        super();
     }
 
     public static void HandleRequestBallList(PlayerCharacter player, RequestBallListMessage msg) {
diff --git a/src/engine/net/client/handlers/RequestEnterWorldHandler.java b/src/engine/net/client/handlers/RequestEnterWorldHandler.java
index 0ce43a3a..3da6d3fa 100644
--- a/src/engine/net/client/handlers/RequestEnterWorldHandler.java
+++ b/src/engine/net/client/handlers/RequestEnterWorldHandler.java
@@ -1,7 +1,5 @@
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.CharacterRecord;
@@ -10,6 +8,8 @@ import engine.db.archive.PvpRecord;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -30,7 +30,7 @@ import org.pmw.tinylog.Logger;
 public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
 
     public RequestEnterWorldHandler() {
-        super(RequestEnterWorldMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RequestGuildListHandler.java b/src/engine/net/client/handlers/RequestGuildListHandler.java
index 4fdee87d..64d89481 100644
--- a/src/engine/net/client/handlers/RequestGuildListHandler.java
+++ b/src/engine/net/client/handlers/RequestGuildListHandler.java
@@ -10,15 +10,14 @@
 package engine.net.client.handlers;
 
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
-import engine.net.client.msg.guild.ReqGuildListMsg;
 import engine.net.client.msg.guild.SendGuildEntryMsg;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
@@ -27,7 +26,7 @@ import engine.objects.PlayerCharacter;
 public class RequestGuildListHandler extends AbstractClientMsgHandler {
 
     public RequestGuildListHandler() {
-        super(ReqGuildListMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/RespawnMsgHandler.java b/src/engine/net/client/handlers/RespawnMsgHandler.java
index 1e4f0d57..441abd52 100644
--- a/src/engine/net/client/handlers/RespawnMsgHandler.java
+++ b/src/engine/net/client/handlers/RespawnMsgHandler.java
@@ -8,11 +8,11 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.MovementManager;
 import engine.job.JobScheduler;
 import engine.jobs.RefreshGroupJob;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -26,7 +26,7 @@ import org.pmw.tinylog.Logger;
 public class RespawnMsgHandler extends AbstractClientMsgHandler {
 
     public RespawnMsgHandler() {
-        super(RespawnMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/SendBallEntryHandler.java b/src/engine/net/client/handlers/SendBallEntryHandler.java
index 8ed595ee..8b96302d 100644
--- a/src/engine/net/client/handlers/SendBallEntryHandler.java
+++ b/src/engine/net/client/handlers/SendBallEntryHandler.java
@@ -18,7 +18,7 @@ import engine.objects.PlayerCharacter;
 public class SendBallEntryHandler extends AbstractClientMsgHandler {
 
     public SendBallEntryHandler() {
-        super(SendBallEntryMessage.class);
+        super();
     }
 
     public static void HandleAddBall(PlayerCharacter player, SendBallEntryMessage msg) {
diff --git a/src/engine/net/client/handlers/SendSummonsMsgHandler.java b/src/engine/net/client/handlers/SendSummonsMsgHandler.java
index 0dac1c53..3718e470 100644
--- a/src/engine/net/client/handlers/SendSummonsMsgHandler.java
+++ b/src/engine/net/client/handlers/SendSummonsMsgHandler.java
@@ -24,7 +24,7 @@ import static engine.gameManager.PowersManager.*;
 public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
 
     public SendSummonsMsgHandler() {
-        super(SendSummonsMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ServerInfoMsgHandler.java b/src/engine/net/client/handlers/ServerInfoMsgHandler.java
index 5d84be0d..b40cb1f7 100644
--- a/src/engine/net/client/handlers/ServerInfoMsgHandler.java
+++ b/src/engine/net/client/handlers/ServerInfoMsgHandler.java
@@ -20,7 +20,7 @@ import org.pmw.tinylog.Logger;
 public class ServerInfoMsgHandler extends AbstractClientMsgHandler {
 
     public ServerInfoMsgHandler() {
-        super(ServerInfoMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/SetCombatModeMsgHandler.java b/src/engine/net/client/handlers/SetCombatModeMsgHandler.java
index a9c4855a..ffab0eaf 100644
--- a/src/engine/net/client/handlers/SetCombatModeMsgHandler.java
+++ b/src/engine/net/client/handlers/SetCombatModeMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
+import engine.mbEnums;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +21,7 @@ import engine.server.MBServerStatics;
 public class SetCombatModeMsgHandler extends AbstractClientMsgHandler {
 
     public SetCombatModeMsgHandler() {
-        super(SetCombatModeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ShowMsgHandler.java b/src/engine/net/client/handlers/ShowMsgHandler.java
index 63ae67f2..9c4090bf 100644
--- a/src/engine/net/client/handlers/ShowMsgHandler.java
+++ b/src/engine/net/client/handlers/ShowMsgHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
+import engine.exception.MsgSendException;
 import engine.mbEnums;
 import engine.mbEnums.DispatchChannel;
-import engine.exception.MsgSendException;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -24,7 +24,7 @@ import engine.objects.PlayerCharacter;
 public class ShowMsgHandler extends AbstractClientMsgHandler {
 
     public ShowMsgHandler() {
-        super(ShowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/SocialMsgHandler.java b/src/engine/net/client/handlers/SocialMsgHandler.java
index 4b8adf96..923db391 100644
--- a/src/engine/net/client/handlers/SocialMsgHandler.java
+++ b/src/engine/net/client/handlers/SocialMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.mbEnums.DispatchChannel;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
@@ -20,7 +20,7 @@ import engine.server.MBServerStatics;
 public class SocialMsgHandler extends AbstractClientMsgHandler {
 
     public SocialMsgHandler() {
-        super(SocialMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/StuckMsgHandler.java b/src/engine/net/client/handlers/StuckMsgHandler.java
index 5558d542..390dbaa4 100644
--- a/src/engine/net/client/handlers/StuckMsgHandler.java
+++ b/src/engine/net/client/handlers/StuckMsgHandler.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class StuckMsgHandler extends AbstractClientMsgHandler {
 
     public StuckMsgHandler() {
-        super(StuckMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/SwearInGuildHandler.java b/src/engine/net/client/handlers/SwearInGuildHandler.java
index 4ee13c72..e33a014d 100644
--- a/src/engine/net/client/handlers/SwearInGuildHandler.java
+++ b/src/engine/net/client/handlers/SwearInGuildHandler.java
@@ -9,14 +9,14 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
-import engine.mbEnums.GuildState;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
+import engine.mbEnums.GuildState;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -35,7 +35,7 @@ import java.util.ArrayList;
 public class SwearInGuildHandler extends AbstractClientMsgHandler {
 
     public SwearInGuildHandler() {
-        super(SwearInGuildMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/SwearInHandler.java b/src/engine/net/client/handlers/SwearInHandler.java
index e9f26523..ea443e4f 100644
--- a/src/engine/net/client/handlers/SwearInHandler.java
+++ b/src/engine/net/client/handlers/SwearInHandler.java
@@ -9,10 +9,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -27,7 +27,7 @@ import engine.objects.PlayerCharacter;
 public class SwearInHandler extends AbstractClientMsgHandler {
 
     public SwearInHandler() {
-        super(SwearInMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TargetObjectMsgHandler.java b/src/engine/net/client/handlers/TargetObjectMsgHandler.java
index c2591992..abef7a1e 100644
--- a/src/engine/net/client/handlers/TargetObjectMsgHandler.java
+++ b/src/engine/net/client/handlers/TargetObjectMsgHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.TargetObjectMsg;
@@ -19,7 +19,7 @@ import engine.objects.PlayerCharacter;
 public class TargetObjectMsgHandler extends AbstractClientMsgHandler {
 
     public TargetObjectMsgHandler() {
-        super(TargetObjectMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TaxCityMsgHandler.java b/src/engine/net/client/handlers/TaxCityMsgHandler.java
index ae13304f..a33bc5c7 100644
--- a/src/engine/net/client/handlers/TaxCityMsgHandler.java
+++ b/src/engine/net/client/handlers/TaxCityMsgHandler.java
@@ -21,7 +21,7 @@ import engine.objects.*;
 public class TaxCityMsgHandler extends AbstractClientMsgHandler {
 
     public TaxCityMsgHandler() {
-        super(TaxCityMsg.class);
+        super();
     }
 
     private static boolean ViewTaxes(TaxCityMsg msg, PlayerCharacter player) {
diff --git a/src/engine/net/client/handlers/TaxResourcesMsgHandler.java b/src/engine/net/client/handlers/TaxResourcesMsgHandler.java
index b69a897b..e5e33207 100644
--- a/src/engine/net/client/handlers/TaxResourcesMsgHandler.java
+++ b/src/engine/net/client/handlers/TaxResourcesMsgHandler.java
@@ -18,7 +18,7 @@ import engine.objects.PlayerCharacter;
 public class TaxResourcesMsgHandler extends AbstractClientMsgHandler {
 
     public TaxResourcesMsgHandler() {
-        super(TaxResourcesMsg.class);
+        super();
     }
 
     private static boolean TaxWarehouse(TaxResourcesMsg msg, PlayerCharacter player) {
diff --git a/src/engine/net/client/handlers/ToggleCombatMsgHandler.java b/src/engine/net/client/handlers/ToggleCombatMsgHandler.java
index 0c71a8ce..1006d764 100644
--- a/src/engine/net/client/handlers/ToggleCombatMsgHandler.java
+++ b/src/engine/net/client/handlers/ToggleCombatMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
+import engine.mbEnums;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +21,7 @@ import engine.server.MBServerStatics;
 public class ToggleCombatMsgHandler extends AbstractClientMsgHandler {
 
     public ToggleCombatMsgHandler() {
-        super(ToggleCombatMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ToggleGroupSplitHandler.java b/src/engine/net/client/handlers/ToggleGroupSplitHandler.java
index 42ae05f4..68e6079a 100644
--- a/src/engine/net/client/handlers/ToggleGroupSplitHandler.java
+++ b/src/engine/net/client/handlers/ToggleGroupSplitHandler.java
@@ -16,14 +16,13 @@ import engine.gameManager.SessionManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.group.GroupUpdateMsg;
-import engine.net.client.msg.group.ToggleGroupSplitMsg;
 import engine.objects.Group;
 import engine.objects.PlayerCharacter;
 
 public class ToggleGroupSplitHandler extends AbstractClientMsgHandler {
 
     public ToggleGroupSplitHandler() {
-        super(ToggleGroupSplitMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java b/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java
index d5b2e401..75fa9ff3 100644
--- a/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java
+++ b/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.mbEnums.DispatchChannel;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +21,7 @@ import engine.server.MBServerStatics;
 public class ToggleLfgRecruitingMsgHandler extends AbstractClientMsgHandler {
 
     public ToggleLfgRecruitingMsgHandler() {
-        super(ToggleLfgRecruitingMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java b/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java
index 4d00f3bd..2e952823 100644
--- a/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java
+++ b/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.mbEnums.DispatchChannel;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +21,7 @@ import engine.server.MBServerStatics;
 public class ToggleSitStandMsgHandler extends AbstractClientMsgHandler {
 
     public ToggleSitStandMsgHandler() {
-        super(ToggleSitStandMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TrackWindowMsgHandler.java b/src/engine/net/client/handlers/TrackWindowMsgHandler.java
index 57bf287b..8070ab0b 100644
--- a/src/engine/net/client/handlers/TrackWindowMsgHandler.java
+++ b/src/engine/net/client/handlers/TrackWindowMsgHandler.java
@@ -8,12 +8,12 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.InterestManagement.WorldGrid;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.PowersManager;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -35,7 +35,7 @@ import java.util.Iterator;
 public class TrackWindowMsgHandler extends AbstractClientMsgHandler {
 
     public TrackWindowMsgHandler() {
-        super(TrackWindowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TradeRequestMsgHandler.java b/src/engine/net/client/handlers/TradeRequestMsgHandler.java
index 16c85abf..ae03dbd2 100644
--- a/src/engine/net/client/handlers/TradeRequestMsgHandler.java
+++ b/src/engine/net/client/handlers/TradeRequestMsgHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -22,7 +22,7 @@ import engine.objects.PlayerCharacter;
 public class TradeRequestMsgHandler extends AbstractClientMsgHandler {
 
     public TradeRequestMsgHandler() {
-        super(TradeRequestMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TrainMsgHandler.java b/src/engine/net/client/handlers/TrainMsgHandler.java
index 44725d55..3ccd0b7d 100644
--- a/src/engine/net/client/handlers/TrainMsgHandler.java
+++ b/src/engine/net/client/handlers/TrainMsgHandler.java
@@ -8,12 +8,12 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.PowersManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class TrainMsgHandler extends AbstractClientMsgHandler {
 
     public TrainMsgHandler() {
-        super(TrainMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TrainerInfoMsgHandler.java b/src/engine/net/client/handlers/TrainerInfoMsgHandler.java
index 90df1819..8b539b2f 100644
--- a/src/engine/net/client/handlers/TrainerInfoMsgHandler.java
+++ b/src/engine/net/client/handlers/TrainerInfoMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
+import engine.mbEnums;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class TrainerInfoMsgHandler extends AbstractClientMsgHandler {
 
     public TrainerInfoMsgHandler() {
-        super(TrainerInfoMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TransferAssetMsgHandler.java b/src/engine/net/client/handlers/TransferAssetMsgHandler.java
index 81a843f1..8ff28b36 100644
--- a/src/engine/net/client/handlers/TransferAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/TransferAssetMsgHandler.java
@@ -1,9 +1,9 @@
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.ChatManager;
+import engine.mbEnums;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
@@ -21,7 +21,7 @@ import engine.objects.PlayerCharacter;
 public class TransferAssetMsgHandler extends AbstractClientMsgHandler {
 
     public TransferAssetMsgHandler() {
-        super(TransferAssetMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java b/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java
index ae1bd894..26f20eae 100644
--- a/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java
+++ b/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java
@@ -1,10 +1,10 @@
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -27,7 +27,7 @@ import org.pmw.tinylog.Logger;
 public class TransferGoldToFromBuildingMsgHandler extends AbstractClientMsgHandler {
 
     public TransferGoldToFromBuildingMsgHandler() {
-        super(TransferGoldToFromBuildingMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java b/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java
index 5f653ea4..f0c1f03b 100644
--- a/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java
+++ b/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java
@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.NPCManager;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -25,7 +25,7 @@ import engine.objects.PlayerCharacter;
 public class TransferItemFromBankMsgHandler extends AbstractClientMsgHandler {
 
     public TransferItemFromBankMsgHandler() {
-        super(TransferItemFromBankMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java b/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java
index ecc7f0f5..0629b60d 100644
--- a/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java
+++ b/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
+import engine.exception.MsgSendException;
 import engine.mbEnums;
 import engine.mbEnums.DispatchChannel;
-import engine.exception.MsgSendException;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ApplyEffectMsg;
@@ -25,7 +25,7 @@ import engine.server.MBServerStatics;
 public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHandler {
 
     public TransferItemFromEquipToInventoryHandler() {
-        super(TransferItemFromEquipToInventoryMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java b/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java
index 4b9882af..46845e52 100644
--- a/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java
+++ b/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java
@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -28,7 +28,7 @@ import engine.server.MBServerStatics;
 public class TransferItemFromInventoryToEquipHandler extends AbstractClientMsgHandler {
 
     public TransferItemFromInventoryToEquipHandler() {
-        super(TransferItemFromInventoryToEquipMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java b/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java
index 3a67d8d8..86aeee94 100644
--- a/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java
+++ b/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java
@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.NPCManager;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -26,7 +26,7 @@ import engine.objects.PlayerCharacter;
 public class TransferItemToBankMsgHandler extends AbstractClientMsgHandler {
 
     public TransferItemToBankMsgHandler() {
-        super(TransferItemToBankMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java b/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java
index f9de8846..890fa69c 100644
--- a/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java
+++ b/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java
@@ -20,7 +20,7 @@ import static engine.objects.CharacterItemManager.canTrade;
 public class UncommitToTradeMsgHandler extends AbstractClientMsgHandler {
 
     public UncommitToTradeMsgHandler() {
-        super(UncommitToTradeMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/UpdateFriendStatusHandler.java b/src/engine/net/client/handlers/UpdateFriendStatusHandler.java
index 166be1db..4830508b 100644
--- a/src/engine/net/client/handlers/UpdateFriendStatusHandler.java
+++ b/src/engine/net/client/handlers/UpdateFriendStatusHandler.java
@@ -9,10 +9,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
-import engine.mbEnums.FriendStatus;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
+import engine.mbEnums.FriendStatus;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -27,7 +27,7 @@ import java.util.HashSet;
 public class UpdateFriendStatusHandler extends AbstractClientMsgHandler {
 
     public UpdateFriendStatusHandler() {
-        super(UpdateFriendStatusMessage.class);
+        super();
     }
 
     //change to Request
diff --git a/src/engine/net/client/handlers/UpdateStateMsgHandler.java b/src/engine/net/client/handlers/UpdateStateMsgHandler.java
index b6d29d8f..e9a36ddf 100644
--- a/src/engine/net/client/handlers/UpdateStateMsgHandler.java
+++ b/src/engine/net/client/handlers/UpdateStateMsgHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +21,7 @@ import engine.server.MBServerStatics;
 public class UpdateStateMsgHandler extends AbstractClientMsgHandler {
 
     public UpdateStateMsgHandler() {
-        super(UpdateStateMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java b/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
index fac09f74..7e87ef8e 100644
--- a/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
@@ -1,11 +1,11 @@
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.GameObjectType;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -28,7 +28,7 @@ public class UpgradeAssetMsgHandler extends AbstractClientMsgHandler {
     // Constructor
     public UpgradeAssetMsgHandler() {
 
-        super(UpgradeAssetMessage.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/UseCharterMsgHandler.java b/src/engine/net/client/handlers/UseCharterMsgHandler.java
index 567c45cb..91bad149 100644
--- a/src/engine/net/client/handlers/UseCharterMsgHandler.java
+++ b/src/engine/net/client/handlers/UseCharterMsgHandler.java
@@ -8,8 +8,8 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -19,7 +19,7 @@ import engine.net.client.msg.UseCharterMsg;
 public class UseCharterMsgHandler extends AbstractClientMsgHandler {
 
     public UseCharterMsgHandler() {
-        super(UseCharterMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/VendorBuyMsgHandler.java b/src/engine/net/client/handlers/VendorBuyMsgHandler.java
index df6eeeac..3130329e 100644
--- a/src/engine/net/client/handlers/VendorBuyMsgHandler.java
+++ b/src/engine/net/client/handlers/VendorBuyMsgHandler.java
@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
 import engine.exception.MsgSendException;
 import engine.gameManager.DbManager;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 public class VendorBuyMsgHandler extends AbstractClientMsgHandler {
 
     public VendorBuyMsgHandler() {
-        super(VendorBuyMsg.class);
+        super();
     }
 
     public static Item createItemForPlayer(PlayerCharacter pc, int templateID) {
diff --git a/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java b/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java
index 890b3d64..ef9db5a1 100644
--- a/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java
+++ b/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -24,7 +24,7 @@ import engine.server.MBServerStatics;
 public class VendorBuyWindowMsgHandler extends AbstractClientMsgHandler {
 
     public VendorBuyWindowMsgHandler() {
-        super(VendorBuyWindowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/VendorDialogMsgHandler.java b/src/engine/net/client/handlers/VendorDialogMsgHandler.java
index 1933abd1..5338a74c 100644
--- a/src/engine/net/client/handlers/VendorDialogMsgHandler.java
+++ b/src/engine/net/client/handlers/VendorDialogMsgHandler.java
@@ -8,14 +8,14 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -28,7 +28,7 @@ import java.util.concurrent.ThreadLocalRandom;
 public class VendorDialogMsgHandler extends AbstractClientMsgHandler {
 
     public VendorDialogMsgHandler() {
-        super(VendorDialogMsg.class);
+        super();
     }
 
     // Handles special case menu selections, such as promote, train, ect.
diff --git a/src/engine/net/client/handlers/VendorSellMsgHandler.java b/src/engine/net/client/handlers/VendorSellMsgHandler.java
index 37d777bf..4965b208 100644
--- a/src/engine/net/client/handlers/VendorSellMsgHandler.java
+++ b/src/engine/net/client/handlers/VendorSellMsgHandler.java
@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 public class VendorSellMsgHandler extends AbstractClientMsgHandler {
 
     public VendorSellMsgHandler() {
-        super(VendorSellMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java b/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java
index 47e9b81f..ab9c2f23 100644
--- a/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java
+++ b/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java
@@ -8,9 +8,9 @@
 
 package engine.net.client.handlers;
 
-import engine.mbEnums.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.SessionManager;
+import engine.mbEnums.DispatchChannel;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -25,7 +25,7 @@ import engine.server.MBServerStatics;
 public class VendorSellWindowMsgHandler extends AbstractClientMsgHandler {
 
     public VendorSellWindowMsgHandler() {
-        super(VendorSellWindowMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/VersionInfoMsgHandler.java b/src/engine/net/client/handlers/VersionInfoMsgHandler.java
index 06ecffb5..de094e71 100644
--- a/src/engine/net/client/handlers/VersionInfoMsgHandler.java
+++ b/src/engine/net/client/handlers/VersionInfoMsgHandler.java
@@ -19,7 +19,7 @@ import engine.server.login.LoginServer;
 public class VersionInfoMsgHandler extends AbstractClientMsgHandler {
 
     public VersionInfoMsgHandler() {
-        super(VersionInfoMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/ViewResourcesMsgHandler.java b/src/engine/net/client/handlers/ViewResourcesMsgHandler.java
index 61bbe598..35879ffa 100644
--- a/src/engine/net/client/handlers/ViewResourcesMsgHandler.java
+++ b/src/engine/net/client/handlers/ViewResourcesMsgHandler.java
@@ -23,7 +23,7 @@ import engine.objects.PlayerCharacter;
 public class ViewResourcesMsgHandler extends AbstractClientMsgHandler {
 
     public ViewResourcesMsgHandler() {
-        super(ViewResourcesMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/handlers/WhoRequestMsgHandler.java b/src/engine/net/client/handlers/WhoRequestMsgHandler.java
index aef875c7..d5e323a8 100644
--- a/src/engine/net/client/handlers/WhoRequestMsgHandler.java
+++ b/src/engine/net/client/handlers/WhoRequestMsgHandler.java
@@ -19,7 +19,7 @@ import engine.objects.PlayerCharacter;
 public class WhoRequestMsgHandler extends AbstractClientMsgHandler {
 
     public WhoRequestMsgHandler() {
-        super(WhoRequestMsg.class);
+        super();
     }
 
     @Override
diff --git a/src/engine/net/client/msg/AbandonAssetMsg.java b/src/engine/net/client/msg/AbandonAssetMsg.java
index c33ca990..e1514b7b 100644
--- a/src/engine/net/client/msg/AbandonAssetMsg.java
+++ b/src/engine/net/client/msg/AbandonAssetMsg.java
@@ -52,24 +52,9 @@ public class AbandonAssetMsg extends ClientNetMsg {
         writer.putInt(this.objectUUID);
     }
 
-    public int getObjectType() {
-        return objectType;
-    }
-
-    public void setObjectType(int value) {
-        this.objectType = value;
-    }
-
     public int getUUID() {
         return objectUUID;
 
     }
 
-    public int getPad() {
-        return pad;
-    }
-
-    public void setPad(int value) {
-        this.pad = value;
-    }
 }