diff --git a/data/login.xml b/data/login.xml
deleted file mode 100644
index a5d9fb58..00000000
--- a/data/login.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<login>
-  <loader>org.apollo.io.player.impl.BinaryPlayerLoader</loader>
-  <saver>org.apollo.io.player.impl.BinaryPlayerSaver</saver>
-</login>
diff --git a/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java b/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java
index 7af52b30..21a70eca 100644
--- a/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java
@@ -6,7 +6,7 @@ import org.apollo.game.event.impl.ButtonEvent;
 import org.apollo.game.model.Player;
 
 /**
- * An {@link EventHandler} which responds to {@link ButtonEvent}s for withdrawing items as notes.
+ * An {@link EventHandler} that responds to {@link ButtonEvent}s for withdrawing items as notes.
  * 
  * @author Graham
  */
diff --git a/src/org/apollo/game/event/handler/impl/BankEventHandler.java b/src/org/apollo/game/event/handler/impl/BankEventHandler.java
index 9d2f1c65..33653c1f 100644
--- a/src/org/apollo/game/event/handler/impl/BankEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/BankEventHandler.java
@@ -10,7 +10,7 @@ import org.apollo.game.model.inter.bank.BankUtils;
 import org.apollo.game.model.inter.bank.BankWithdrawEnterAmountListener;
 
 /**
- * An event handler which handles withdrawing and depositing items from/to a player's bank.
+ * An {@link EventHandler} that handles withdrawing and depositing items from/to a player's bank.
  * 
  * @author Graham
  */
@@ -21,7 +21,7 @@ public final class BankEventHandler extends EventHandler<ItemActionEvent> {
 	 * 
 	 * @param option The option.
 	 * @return The amount.
-	 * @throws IllegalArgumentException If the option is not legal.
+	 * @throws IllegalArgumentException If the option is invalid.
 	 */
 	private static final int optionToAmount(int option) {
 		switch (option) {
@@ -51,10 +51,8 @@ public final class BankEventHandler extends EventHandler<ItemActionEvent> {
 		if (amount == -1) {
 			player.getInterfaceSet().openEnterAmountDialog(
 					new BankDepositEnterAmountListener(player, event.getSlot(), event.getId()));
-		} else {
-			if (!BankUtils.deposit(player, event.getSlot(), event.getId(), amount)) {
-				ctx.breakHandlerChain();
-			}
+		} else if (!BankUtils.deposit(player, event.getSlot(), event.getId(), amount)) {
+			ctx.breakHandlerChain();
 		}
 	}
 
diff --git a/src/org/apollo/game/event/handler/impl/ChatEventHandler.java b/src/org/apollo/game/event/handler/impl/ChatEventHandler.java
index 6cff17af..c7ecf63f 100644
--- a/src/org/apollo/game/event/handler/impl/ChatEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/ChatEventHandler.java
@@ -7,7 +7,7 @@ import org.apollo.game.model.Player;
 import org.apollo.game.sync.block.SynchronizationBlock;
 
 /**
- * An event handler which broadcasts public chat messages.
+ * An {@link EventHandler} that broadcasts public chat messages.
  * 
  * @author Graham
  */
diff --git a/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java b/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java
index 6c80d047..0454e2c1 100644
--- a/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java
+++ b/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java
@@ -6,7 +6,7 @@ import org.apollo.game.event.impl.ChatEvent;
 import org.apollo.game.model.Player;
 
 /**
- * An event handler which verifies chat events.
+ * An {@link EventHandler} that verifies {@link ChatEvent}s.
  * 
  * @author Graham
  */
diff --git a/src/org/apollo/game/event/handler/impl/CommandEventHandler.java b/src/org/apollo/game/event/handler/impl/CommandEventHandler.java
index 438ab48d..1456d23e 100644
--- a/src/org/apollo/game/event/handler/impl/CommandEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/CommandEventHandler.java
@@ -8,7 +8,7 @@ import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
 
 /**
- * An {@link EventHandler} which dispatches {@link CommandEvent}s.
+ * An {@link EventHandler} that dispatches {@link CommandEvent}s.
  * 
  * @author Graham
  */
diff --git a/src/org/apollo/game/event/handler/impl/EquipEventHandler.java b/src/org/apollo/game/event/handler/impl/EquipEventHandler.java
index 68d1401a..f7a3698d 100644
--- a/src/org/apollo/game/event/handler/impl/EquipEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/EquipEventHandler.java
@@ -13,7 +13,7 @@ import org.apollo.game.model.inv.SynchronizationInventoryListener;
 import org.apollo.util.LanguageUtil;
 
 /**
- * An event handler which equips items.
+ * An {@link EventHandler} that equips items.
  * 
  * @author Major
  * @author Graham
diff --git a/src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java b/src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java
index bee84129..aa85e9c0 100644
--- a/src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java
+++ b/src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java
@@ -10,7 +10,7 @@ import org.apollo.game.model.inter.bank.BankConstants;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**
- * An {@link EventHandler} which verifies the target item in {@link ItemOnItemEvent}s.
+ * An {@link EventHandler} that verifies the target item in {@link ItemOnItemEvent}s.
  * 
  * @author Chris Fletcher
  */
@@ -32,6 +32,7 @@ public final class ItemOnItemVerificationHandler extends EventHandler<ItemOnItem
 			inventory = player.getBank();
 			break;
 		default:
+			ctx.breakHandlerChain();
 			return;
 		}
 
diff --git a/src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java b/src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java
index c586612b..a1a79ae2 100644
--- a/src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java
+++ b/src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java
@@ -10,15 +10,12 @@ import org.apollo.game.model.inter.bank.BankConstants;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**
- * An {@link EventHandler} which verifies {@link InventoryItemEvent}s.
+ * An {@link EventHandler} that verifies {@link InventoryItemEvent}s.
  * 
  * @author Chris Fletcher
  */
 public final class ItemVerificationHandler extends EventHandler<InventoryItemEvent> {
 
-	/**
-	 * Checks if the information provided by the event is valid, breaking the handler chain if it isn't.
-	 */
 	@Override
 	public void handle(EventHandlerContext ctx, Player player, InventoryItemEvent event) {
 		Inventory inventory;
@@ -35,6 +32,7 @@ public final class ItemVerificationHandler extends EventHandler<InventoryItemEve
 			inventory = player.getBank();
 			break;
 		default:
+			ctx.breakHandlerChain();
 			return;
 		}
 
diff --git a/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java b/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java
index f5d75555..c51f4436 100644
--- a/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java
@@ -7,7 +7,7 @@ import org.apollo.game.event.impl.PlayerDesignEvent;
 import org.apollo.game.model.Player;
 
 /**
- * A handler which handles {@link PlayerDesignEvent}s.
+ * An {@link EventHandler} that handles {@link PlayerDesignEvent}s.
  * 
  * @author Graham
  */
diff --git a/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java b/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java
index a8707b3c..4b3acd66 100644
--- a/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java
+++ b/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java
@@ -8,7 +8,7 @@ import org.apollo.game.model.Player;
 import org.apollo.game.model.settings.Gender;
 
 /**
- * A handler which verifies {@link PlayerDesignEvent}s.
+ * An {@link EventHandler} that verifies {@link PlayerDesignEvent}s.
  * 
  * @author Graham
  */
diff --git a/src/org/apollo/game/event/handler/impl/RemoveEventHandler.java b/src/org/apollo/game/event/handler/impl/RemoveEventHandler.java
index 78d8a14c..046cd6c1 100644
--- a/src/org/apollo/game/event/handler/impl/RemoveEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/RemoveEventHandler.java
@@ -10,7 +10,7 @@ import org.apollo.game.model.def.ItemDefinition;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**
- * An event handler which removes equipped items.
+ * An {@link EventHandler} that removes equipped items.
  * 
  * @author Graham
  * @author Major
diff --git a/src/org/apollo/game/event/handler/impl/WalkEventHandler.java b/src/org/apollo/game/event/handler/impl/WalkEventHandler.java
index a2d8ca01..eeb1d420 100644
--- a/src/org/apollo/game/event/handler/impl/WalkEventHandler.java
+++ b/src/org/apollo/game/event/handler/impl/WalkEventHandler.java
@@ -8,7 +8,7 @@ import org.apollo.game.model.Position;
 import org.apollo.game.model.WalkingQueue;
 
 /**
- * A handler for the {@link WalkEvent}.
+ * A{@link EventHandler} that handles {@link WalkEvent}s.
  * 
  * @author Graham
  */