Cleanups

Did not need so much error checking. Bukkit does a lot on its own.