Removed a bit of un-needed code and generally improved CraftBukkit.