Removed extraneous fields