Cleaning up the CMake files