Removed B2_LocationMatch

It was never actually referenced in code. Must be a holdover from an old
build.
Moved minor function to geocode

It didn't have a reason to be in geocode_replace_loc.