add geocoding and clean up unused files...