Remove dead code
Merge remote-tracking branch 'archetype/master'