remove extra file, use location scope to override search address

Until Autocomplete lets you specify a city scope, lots of other cities
can show up in the drop down, and I often click the wrong city on my
phone.  This change is to ignore the city altogether if already
specified in the location scope.