More build cleanup.