remove fields incorrectly pulled in merge