More clean up the main CMakeLists.txt