Fixed build cleanup