Eliminate country and state fields from address