Cleanup for Bukkit 1.7