Fixes #149 and #134

Fixes #149 and #134 (delete the archetype)