remove extraneous functions and distance reliance