More build cleanup