Remove redundant field
Finish if no city picked up