Some archetype cleanup