Prune more unused fields