Revert "City model updated"

This reverts commit bcdd61661832f3a56ce526e2dab3c15206bc86cc.
Revert "Revert "City model updated""

This reverts commit 28fb0df0ef73d9046d203793fc87141d8d98093c.
Revert "Revert "Revert "City model updated"""

This reverts commit df1967075be6f10c34dd4f12b00d514754c84f02.
Revert "Revert "Revert "Revert "City model updated""""

This reverts commit 345eccb56dbf7065e22499cd1d1b32faf2bf7f68.
Revert 061d71b..82ac165

This rolls back to commit 061d71b687fd6617522ab71d446514f5b06d6d5a.
City model updated