More removal of obsolete CMake code