more build cleanup