Updating the CMake file to remove code that is not needed any more.