remove duplicates and make some minor changes to a few config files