CMakeLists.txt cleanup