removing unused fields
removing unused fields