CMake file cleanup