Remove 3D testing stuff, Mac tweaks