Cleaned up the creation of temp directories during the build process. Unit tests passed.