fixed mana overflow and deleted unnecessary classes