Remove duplicate fields from entity inheritance