removed unusued GoTo and distance requirements