Merge "Remove all ARCH references."