VisitorBase cleanup