more CMake cleanup