Removed unnecessary data fields and removed checkstyle errors
Removed unnecessary data fields and removed checkstyle errors