Cleaning up the build