Final Fix and clean CMake output file