Cleaning up from our deprecated permissions.

Also cleaned up the unholy mess that was SkillResetCommand.