MDL-29406 fix greedy config settings cleanup