removed Arch-specific stuff