Cleanup duplicate config options