Final cleanup of NearestPoints