Clean up visitor implementation