Removed some more unused fields.