Cleaned up dead code and updated project to compile successfully against bukkit 1.7.10