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