Core/Spells: Cleanup for paladin 4.3.4