remove dependency on Distance package