Cleaning up unused fields.