Removed ethnicity from customer
Added State & country fields to customer address form  as drop downs