Remove unused intersection points and other tweaks