Removed geocode service and caching, only for commercial