Fix line popping, remove CullState dependency