Getting rid of x86 and mixed platform configurations