Index: c/Common/CompilerError.h
===================================================================
--- src/Common/CompilerError.h	(revision 966b4c6be592a050145d2121e6c9c1a7d5af41b0)
+++ 	(revision )
@@ -1,36 +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.
-//
-// CompilerError.h -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:18:07 2017
-// Update Count     : 4
-//
-
-#pragma once
-
-#include <string>
-
-class CompilerError : public std::exception {
-  public:
-	CompilerError();
-	CompilerError( std::string what ) : what( what ) {}
-	~CompilerError() throw () {}
-
-	std::string get_what() const { return what; }
-	void set_what( std::string newValue ) { what = newValue; }
-  private:
-	std::string what;
-};
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: c/Common/UnimplementedError.h
===================================================================
--- src/Common/UnimplementedError.h	(revision 966b4c6be592a050145d2121e6c9c1a7d5af41b0)
+++ 	(revision )
@@ -1,36 +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.
-//
-// UnimplementedError.h -- 
-//
-// Author           : Richard C. Bilson
-// Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:18:35 2017
-// Update Count     : 2
-//
-
-#pragma once
-
-#include <string>
-
-class UnimplementedError : public std::exception {
-  public:
-	UnimplementedError();
-	UnimplementedError( std::string what ) : what( what ) {}
-	~UnimplementedError() throw () {}
-  
-	std::string get_what() const { return what; }
-	void set_what( std::string newValue ) { what = newValue; }
-  private:
-	std::string what;
-};
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/Common/module.mk
===================================================================
--- src/Common/module.mk	(revision 966b4c6be592a050145d2121e6c9c1a7d5af41b0)
+++ src/Common/module.mk	(revision f26421f53c13cb2c11706b67cacff67fc3e20f4a)
@@ -20,5 +20,4 @@
 	Common/CodeLocationTools.hpp \
 	Common/CodeLocationTools.cpp \
-	Common/CompilerError.h \
 	Common/Debug.h \
 	Common/DeclStats.hpp \
@@ -52,5 +51,4 @@
 	Common/Stats/Time.cc \
 	Common/Stats/Time.h \
-	Common/UnimplementedError.h \
 	Common/UniqueName.cc \
 	Common/UniqueName.h \
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 966b4c6be592a050145d2121e6c9c1a7d5af41b0)
+++ src/main.cc	(revision f26421f53c13cb2c11706b67cacff67fc3e20f4a)
@@ -40,9 +40,7 @@
 #include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
-#include "Common/CompilerError.h"           // for CompilerError
 #include "Common/DeclStats.hpp"             // for printDeclStats
 #include "Common/ResolvProtoDump.hpp"       // for dumpAsResolverProto
 #include "Common/Stats.h"                   // for Stats
-#include "Common/UnimplementedError.h"      // for UnimplementedError
 #include "Common/utility.h"                 // for deleteAll, filter, printAll
 #include "Concurrency/Actors.hpp"           // for implementActors
@@ -480,17 +478,4 @@
 		} // if
 		return EXIT_FAILURE;
-	} catch ( UnimplementedError & e ) {
-		cout << "Sorry, " << e.get_what() << " is not currently implemented" << endl;
-		if ( output != &cout ) {
-			delete output;
-		} // if
-		return EXIT_FAILURE;
-	} catch ( CompilerError & e ) {
-		cerr << "Compiler Error: " << e.get_what() << endl;
-		cerr << "(please report bugs to [REDACTED])" << endl;
-		if ( output != &cout ) {
-			delete output;
-		} // if
-		return EXIT_FAILURE;
 	} catch ( std::bad_alloc & ) {
 		cerr << "*cfa-cpp compilation error* std::bad_alloc" << endl;
