Index: src/SynTree/AddStmtVisitor.cc
===================================================================
--- src/SynTree/AddStmtVisitor.cc	(revision f265042c897846bca67d9bccada8b87b9ad4daf8)
+++ 	(revision )
@@ -1,93 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// AddStmtVisitor.cc --
-//
-// Author           : Rob Schluntz
-// Created On       : Wed Jun 22 12:11:17 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:23:47 2016
-// Update Count     : 16
-//
-
-#include "AddStmtVisitor.h"
-
-#include "Common/SemanticError.h"  // for SemanticError
-#include "Declaration.h"           // for Declaration
-#include "Expression.h"            // for Expression
-#include "Statement.h"             // for CompoundStmt, ForStmt, IfStmt, Sta...
-#include "SynTree/Label.h"         // for Label, noLabels
-
-void AddStmtVisitor::visitStatementList( std::list< Statement* > &statements ) {
-	for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
-		if ( ! stmtsToAddAfter.empty() ) {
-			statements.splice( i, stmtsToAddAfter );
-		} // if
-		(*i)->accept( *this );
-		if ( ! stmtsToAdd.empty() ) {
-			statements.splice( i, stmtsToAdd );
-		} // if
-	} // for
-	if ( ! stmtsToAddAfter.empty() ) {
-		statements.splice( statements.end(), stmtsToAddAfter );
-	} // if
-}
-
-Statement * AddStmtVisitor::visitStatement( Statement *stmt ) {
-	maybeAccept( stmt, *this );
-	if ( ! stmtsToAdd.empty() || ! stmtsToAddAfter.empty() ) {
-		CompoundStmt *compound = new CompoundStmt( noLabels );
-		compound->get_kids().splice( compound->get_kids().end(), stmtsToAdd );
-		compound->get_kids().push_back( stmt );
-		compound->get_kids().splice( compound->get_kids().end(), stmtsToAddAfter );
-		return compound;
-	} else {
-		return stmt;
-	}
-}
-
-void AddStmtVisitor::visit(CompoundStmt *compoundStmt) {
-	visitStatementList( compoundStmt->get_kids() );
-}
-
-void AddStmtVisitor::visit(IfStmt *ifStmt) {
-	ifStmt->set_thenPart( visitStatement( ifStmt->get_thenPart() ) );
-	ifStmt->set_elsePart( visitStatement( ifStmt->get_elsePart() ) );
-	maybeAccept( ifStmt->get_condition(), *this );
-}
-
-void AddStmtVisitor::visit(WhileStmt *whileStmt) {
-	whileStmt->set_body( visitStatement( whileStmt->get_body() ) );
-	maybeAccept( whileStmt->get_condition(), *this );
-}
-
-void AddStmtVisitor::visit(ForStmt *forStmt) {
-	forStmt->set_body( visitStatement( forStmt->get_body() ) );
-	acceptAll( forStmt->get_initialization(), *this );
-	maybeAccept( forStmt->get_condition(), *this );
-	maybeAccept( forStmt->get_increment(), *this );
-}
-
-void AddStmtVisitor::visit(SwitchStmt *switchStmt) {
-	visitStatementList( switchStmt->get_statements() );
-	maybeAccept( switchStmt->get_condition(), *this );
-}
-
-void AddStmtVisitor::visit(CaseStmt *caseStmt) {
-	visitStatementList( caseStmt->get_statements() );
-	maybeAccept( caseStmt->get_condition(), *this );
-}
-
-void AddStmtVisitor::visit(CatchStmt *catchStmt) {
-	catchStmt->set_body( visitStatement( catchStmt->get_body() ) );
-	maybeAccept( catchStmt->get_decl(), *this );
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/SynTree/AddStmtVisitor.h
===================================================================
--- src/SynTree/AddStmtVisitor.h	(revision f265042c897846bca67d9bccada8b87b9ad4daf8)
+++ 	(revision )
@@ -1,47 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// AddStmtVisitor.h --
-//
-// Author           : Rob Schluntz
-// Created On       : Wed Jun 22 12:05:48 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:51:08 2017
-// Update Count     : 9
-//
-
-#pragma once
-
-#include <list>               // for list
-
-#include "SynTree/SynTree.h"  // for Visitor Nodes
-#include "SynTree/Visitor.h"  // for Visitor
-
-class AddStmtVisitor : public Visitor {
-  public:
-	typedef Visitor Parent;
-
-	using Parent::visit;
-	virtual void visit(CompoundStmt *compoundStmt);
-	virtual void visit(IfStmt *ifStmt);
-	virtual void visit(WhileStmt *whileStmt);
-	virtual void visit(ForStmt *forStmt);
-	virtual void visit(SwitchStmt *switchStmt);
-	virtual void visit(CaseStmt *caseStmt);
-	virtual void visit(CatchStmt *catchStmt);
-
-  protected:
-	void visitStatementList( std::list< Statement * > & );
-	Statement * visitStatement( Statement * );
-	std::list< Statement* > stmtsToAdd;
-	std::list< Statement* > stmtsToAddAfter;
-};
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/SynTree/module.mk
===================================================================
--- src/SynTree/module.mk	(revision f265042c897846bca67d9bccada8b87b9ad4daf8)
+++ src/SynTree/module.mk	(revision 888339e49e0dfdc2d6c754b7216c77bd5a8afc43)
@@ -48,5 +48,4 @@
        SynTree/Visitor.cc \
        SynTree/Mutator.cc \
-       SynTree/AddStmtVisitor.cc \
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc \