Remove dependencies for DistanceCalculator class