Remove geolocation code and prefer off to unbind