Remove nested location city/state, add zip