Index: c/InitTweak/InitExpander.cc
===================================================================
--- src/InitTweak/InitExpander.cc	(revision 46f61345ffd40c8a09b489da6e3b288fbf479cdf)
+++ 	(revision )
@@ -1,52 +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.
-//
-// InitExpander.cc -- 
-//
-// Author           : Rodolfo G. Esteves
-// Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:34:12 2015
-// Update Count     : 1
-//
-
-#include <list>
-#include <stack>
-#include <cassert>
-#include <algorithm>
-
-#include "Common/utility.h"
-#include "InitExpander.h"
-#include "InitModel.h"
-
-namespace InitTweak {
-	InitExpander::InitExpander() {}
-
-	InitExpander::~InitExpander() {}
-
-	ObjectDecl *InitExpander::mutate( ObjectDecl *objectDecl ) {
-		index.visit( objectDecl );
-
-		if ( objectDecl->get_init() == 0 ) return objectDecl;
-
-		InitModelBuilder builder( objectDecl );
-		builder.get_assoc()->display( std::cerr ); // xxx
-		InitModelFiller filler( builder.get_assoc(), objectDecl->get_init(), true );
-		// filler.get_assoc()->display( std::cerr ); // xxx
-		InitUnspooler exp;
-		filler.get_assoc()->accept( exp );
-		objectDecl->set_init( exp.grab_initializer() );
-		objectDecl->get_init()->print( std::cerr );
-
-		return objectDecl;
-	}
-} // namespace InitTweak
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: c/InitTweak/InitExpander.h
===================================================================
--- src/InitTweak/InitExpander.h	(revision 46f61345ffd40c8a09b489da6e3b288fbf479cdf)
+++ 	(revision )
@@ -1,74 +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.
-//
-// InitExpander.h -- 
-//
-// Author           : Rodolfo G. Esteves
-// Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:35:33 2015
-// Update Count     : 2
-//
-
-#ifndef _INIT_EXPANDER_H_
-#define _INIT_EXPANDER_H_
-
-#include <string>
-
-#include "Common/utility.h"
-#include "SynTree/Mutator.h"
-#include "SymTab/Indexer.h"
-
-#include "SynTree/Statement.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
-
-namespace InitTweak {
-	class InitExpander : public Mutator {
-		typedef Mutator Parent;
-	  public:
-		InitExpander();
-		~InitExpander();
-
-		virtual ObjectDecl *mutate( ObjectDecl * );
-
-		// indexer runs
-		virtual FunctionDecl   *mutate( FunctionDecl *functionDecl ) {
-			functionDecl->set_functionType( maybeMutate( functionDecl->get_functionType(), *this ) );
-			mutateAll( functionDecl->get_oldDecls(), *this );
-			functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
-
-			index.visit( functionDecl );
-			return functionDecl;
-		}
-
-		virtual TypeDecl *mutate( TypeDecl *typeDecl )
-			{ index.visit( typeDecl ); return typeDecl; }
-		virtual TypedefDecl *mutate( TypedefDecl *typeDecl )
-			{ index.visit( typeDecl ); return typeDecl; }
-		virtual StructDecl *mutate( StructDecl *aggregateDecl )
-			{ index.visit( aggregateDecl ); return aggregateDecl; }
-		virtual UnionDecl *mutate( UnionDecl *aggregateDecl )
-			{ index.visit( aggregateDecl ); return aggregateDecl; }
-		virtual EnumDecl *mutate( EnumDecl *aggregateDecl )
-			{ index.visit( aggregateDecl ); return aggregateDecl; }
-
-		virtual Type *mutate( StructInstType *aggrInst )
-			{ index.visit( aggrInst ); return aggrInst; }
-		virtual Type *mutate( UnionInstType *aggrInst )
-			{ index.visit( aggrInst ); return aggrInst; }
-	  private:
-		SymTab::Indexer index;
-	};  // class InitExpander
-} // namespace InitTweak
-
-#endif // _INIT_EXPANDER_H_
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/InitTweak/Mutate.cc
===================================================================
--- src/InitTweak/Mutate.cc	(revision 46f61345ffd40c8a09b489da6e3b288fbf479cdf)
+++ src/InitTweak/Mutate.cc	(revision ad4581b92c4dfccbb3a38993ff4021d2330b9138)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mutate.cc -- 
+// Mutate.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -17,5 +17,4 @@
 
 #include "Mutate.h"
-#include "InitExpander.h"
 //#include "BasicInit.h"
 //#include "DeclarationHoister.h"