more visitor cleanup