CMakefile cleanup