I think we also need to remove any fields not present in finalValue?