Cleanup Archer defs