Remove extraneous water intersections