Remove unused short and order fields.  Change long to name.