SpellSkillInterface: Some cleanup