Revert code changes; leave them as comments as the city itself should not be in the list of neighbours although the unit tests want it to be!