Cleanup
Get the build working