Remove call to Google Maps API, some cleanup