Cleaning up the build process