Remove arch tags throughout