Other round of build cleanup