eliminating some extraneous config options.