More CMake cleanup