Remove some unused fields