remove commented out line
clarify method, remove current_visitor stub