Some build cleanup.