Removed ARCH, PREFIX_OPT, etc