Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision 1931bb01089a99a839382b07c869b845128790a0)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision b9f827433276c429e2d2dc4909601d95a06f6d0f)
@@ -41,5 +41,4 @@
 #include "Common/utility.h"       // for move, copy
 #include "SymTab/Mangler.h"
-#include "SymTab/Validate.h"      // for validateType
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
 #include "InitTweak/InitTweak.h"  // for getPointerBase
@@ -1091,5 +1090,4 @@
 			assert( toType );
 			toType = resolveTypeof( toType, context );
-			// toType = SymTab::validateType( castExpr->location, toType, symtab );
 			toType = adjustExprType( toType, tenv, symtab );
 
@@ -1582,5 +1580,4 @@
 				// calculate target type
 				const ast::Type * toType = resolveTypeof( initAlt.type, context );
-				// toType = SymTab::validateType( initExpr->location, toType, symtab );
 				toType = adjustExprType( toType, tenv, symtab );
 				// The call to find must occur inside this loop, otherwise polymorphic return
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 1931bb01089a99a839382b07c869b845128790a0)
+++ src/SymTab/Validate.cc	(revision b9f827433276c429e2d2dc4909601d95a06f6d0f)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 17 14:36:00 2022
-// Update Count     : 366
+// Last Modified On : Tue Jul 12 15:00:00 2022
+// Update Count     : 367
 //
 
@@ -294,5 +294,5 @@
 	};
 
-	void validate_A( std::list< Declaration * > & translationUnit ) {
+	void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
 		PassVisitor<HoistTypeDecls> hoistDecls;
 		{
@@ -305,7 +305,4 @@
 			decayEnumsAndPointers( translationUnit ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes_old because it is an indexer and needs correct types for mangling
 		}
-	}
-
-	void validate_B( std::list< Declaration * > & translationUnit ) {
 		PassVisitor<FixQualifiedTypes> fixQual;
 		{
@@ -317,7 +314,4 @@
 			EliminateTypedef::eliminateTypedef( translationUnit );
 		}
-	}
-
-	void validate_C( std::list< Declaration * > & translationUnit ) {
 		PassVisitor<ValidateGenericParameters> genericParams;
 		PassVisitor<ResolveEnumInitializers> rei( nullptr );
@@ -343,7 +337,4 @@
 			});
 		}
-	}
-
-	void validate_D( std::list< Declaration * > & translationUnit ) {
 		{
 			Stats::Heap::newPass("validate-D");
@@ -362,7 +353,4 @@
 			});
 		}
-	}
-
-	void validate_E( std::list< Declaration * > & translationUnit ) {
 		PassVisitor<CompoundLiteral> compoundliteral;
 		{
@@ -384,7 +372,4 @@
 			}
 		}
-	}
-
-	void validate_F( std::list< Declaration * > & translationUnit ) {
 		PassVisitor<LabelAddressFixer> labelAddrFixer;
 		{
@@ -410,13 +395,4 @@
 			}
 		}
-	}
-
-	void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
-		validate_A( translationUnit );
-		validate_B( translationUnit );
-		validate_C( translationUnit );
-		validate_D( translationUnit );
-		validate_E( translationUnit );
-		validate_F( translationUnit );
 	}
 
Index: src/SymTab/Validate.h
===================================================================
--- src/SymTab/Validate.h	(revision 1931bb01089a99a839382b07c869b845128790a0)
+++ src/SymTab/Validate.h	(revision b9f827433276c429e2d2dc4909601d95a06f6d0f)
@@ -11,6 +11,6 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 17 14:35:00 2022
-// Update Count     : 5
+// Last Modified On : Tue Jul 12 15:30:00 2022
+// Update Count     : 6
 //
 
@@ -19,26 +19,9 @@
 #include <list>  // for list
 
-struct CodeLocation;
-class  Declaration;
-class  Type;
-
-namespace ast {
-	class Type;
-	class SymbolTable;
-}
+class Declaration;
 
 namespace SymTab {
-	class Indexer;
-
 	/// Normalizes struct and function declarations
 	void validate( std::list< Declaration * > &translationUnit, bool doDebug = false );
-
-	// Sub-passes of validate.
-	void validate_A( std::list< Declaration * > &translationUnit );
-	void validate_B( std::list< Declaration * > &translationUnit );
-	void validate_C( std::list< Declaration * > &translationUnit );
-	void validate_D( std::list< Declaration * > &translationUnit );
-	void validate_E( std::list< Declaration * > &translationUnit );
-	void validate_F( std::list< Declaration * > &translationUnit );
 } // namespace SymTab
 
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 1931bb01089a99a839382b07c869b845128790a0)
+++ src/main.cc	(revision b9f827433276c429e2d2dc4909601d95a06f6d0f)
@@ -474,10 +474,5 @@
 		} else {
 			// add the assignment statement after the initialization of a type parameter
-			PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
-			PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
-			PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
-			PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
-			PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
-			PASS( "Validate-F", SymTab::validate_F( translationUnit ) );
+			PASS( "Validate", SymTab::validate( translationUnit ) );
 
 			if ( symtabp ) {