Removed legacy visitor