Removed City dependency