Fix deprecated mechanism for location resolution
Issue #469: Remove unused import