CMake cleanups