Commenting out visitor context stuff