Further build cleanup