remove cruft
fix geolocation commits