Tidy up spurious include of geolocator
Tidy up scoping in gmaps geolocator client code