removed ethnicity model and tests