Bug Fix -- Removing City from everywhere