Cmake cleaning

Again a bit of cleaning in the CMake build files.