Remove RandomBalancer and tidy up Distances