remove lines & intersections, fix some tests