Simplify distance (#2109)