Fixed field type returned value. Removed unused fields.
Fixed field type returned value. Removed unused fields.