CMakeLists cleaning