removed name fields for the time being