removes unreliable distance API
resolves merge conflicts