Remove doubling of config options