SpellManager clean up and excess removal