VID-1470 Removing duplicate fields