archetypes cleanup
dependency fixes