Cleaning up some Skill-related stuff