Partial clean-up of CMake configuration