Tweaks to speed up build and remove unneeded bits