Magic clean up, now I must only upgrade HeroesSkillTree.java