* cleanup the configuration system a bit: