consolidate race fields, remove required