Remove unused fields.
More range-based for.