Index: src/GenPoly/DeclMutator.cc
===================================================================
--- src/GenPoly/DeclMutator.cc	(revision ca35c51743c5aa90ec6fd8bc56f12cfc866101ff)
+++ src/GenPoly/DeclMutator.cc	(revision 7a2c5391125b9883c62c426c1d9f44b5e4e433a5)
@@ -9,7 +9,7 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Nov 27 14:44:00 2015
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:38:46 2016
+// Update Count     : 2
 //
 
@@ -167,10 +167,4 @@
 	}
 	
-	Statement* DeclMutator::mutate(ChooseStmt *chooseStmt) {
-		chooseStmt->set_condition( maybeMutate( chooseStmt->get_condition(), *this ) );
-		mutateAll( chooseStmt->get_branches(), *this );
-		return chooseStmt;
-	}
-	
 	Statement* DeclMutator::mutate(CaseStmt *caseStmt) {
 		caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
Index: src/GenPoly/DeclMutator.h
===================================================================
--- src/GenPoly/DeclMutator.h	(revision ca35c51743c5aa90ec6fd8bc56f12cfc866101ff)
+++ src/GenPoly/DeclMutator.h	(revision 7a2c5391125b9883c62c426c1d9f44b5e4e433a5)
@@ -9,7 +9,7 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Nov 27 14:44:00 2015
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:39:01 2016
+// Update Count     : 2
 //
 
@@ -36,5 +36,4 @@
 		virtual Statement* mutate(ForStmt *forStmt);
 		virtual Statement* mutate(SwitchStmt *switchStmt);
-		virtual Statement* mutate(ChooseStmt *chooseStmt);
 		virtual Statement* mutate(CaseStmt *caseStmt);
 		virtual Statement* mutate(TryStmt *tryStmt);
Index: src/GenPoly/PolyMutator.cc
===================================================================
--- src/GenPoly/PolyMutator.cc	(revision ca35c51743c5aa90ec6fd8bc56f12cfc866101ff)
+++ src/GenPoly/PolyMutator.cc	(revision 7a2c5391125b9883c62c426c1d9f44b5e4e433a5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 02 14:50:58 2016
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:39:32 2016
+// Update Count     : 12
 //
 
@@ -104,10 +104,4 @@
 	}
 
-	Statement * PolyMutator::mutate(ChooseStmt *switchStmt) {
-		mutateStatementList( switchStmt->get_branches() );
-		switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
-		return switchStmt;
-	}
-
 	Statement * PolyMutator::mutate(CaseStmt *caseStmt) {
 		mutateStatementList( caseStmt->get_statements() );
Index: src/GenPoly/PolyMutator.h
===================================================================
--- src/GenPoly/PolyMutator.h	(revision ca35c51743c5aa90ec6fd8bc56f12cfc866101ff)
+++ src/GenPoly/PolyMutator.h	(revision 7a2c5391125b9883c62c426c1d9f44b5e4e433a5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Dec 08 15:19:05 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:39:41 2016
+// Update Count     : 6
 //
 
@@ -37,5 +37,4 @@
 		virtual Statement* mutate(ForStmt *forStmt);
 		virtual Statement* mutate(SwitchStmt *switchStmt);
-		virtual Statement* mutate(ChooseStmt *chooseStmt);
 		virtual Statement* mutate(CaseStmt *caseStmt);
 		virtual Statement* mutate(TryStmt *returnStmt);