Remove duplicate fields