Fixed field type returned value. Removed unused fields.