more cleanup related to removing CraftBukkit dependency