Remove need for arch_prefix