Get rid of the visit select hack