Remove calculated fields from data