cleanups in CMakeLists