Intersection test cleanup