Cleanup - WIP. Get rid of some ARM & PPC stuff