Revert "Added Distance Tracking"

This reverts commit fe239730b84f114329284561c9744a4b9e22d93a.