#24 Remove no need archetype