DisplayVisitor cleanup