Unused fields removed