minor code improvements and removing code that relies on our closed source geocoding module