CMakeLists cleanup