Further cleaning of CMake