CMakeLists clean up