further cleanup of CMakefile