Update to cleanup already doppeled fields that should be removed before flattening.