remove country from city/statezip display logic