More CMake cleanups