Removed some unused fields.