Removed Bukkit & Cleaned Code