[BUG #6169] minor clean-up of config