CMake cleanup