removed unused fields
removed unused fields