Use Utils::calcDist for all distance calculations

There were 3 different methods, which essentially did all the same thing.