diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
index b53818e657..9be340f8fa 100644
--- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
+++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
@@ -32,65 +32,65 @@ final class StaticClassLists {
 				org.hibernate.persister.entity.SingleTableEntityPersister.class,
 				org.hibernate.tuple.entity.PojoEntityTuplizer.class,
 				//ANTLR special ones:
-				org.hibernate.hql.internal.ast.tree.EntityJoinFromElement.class,
-				org.hibernate.hql.internal.ast.tree.MapKeyEntityFromElement.class,
-				org.hibernate.hql.internal.ast.tree.ComponentJoin.class,
+//				org.hibernate.hql.internal.ast.tree.EntityJoinFromElement.class,
+//				org.hibernate.hql.internal.ast.tree.MapKeyEntityFromElement.class,
+//				org.hibernate.hql.internal.ast.tree.ComponentJoin.class,
 		};
 	}
 
 	public static Class[] typesNeedingDefaultConstructorAccessible() {
 		return new Class[] {
 				//Support for @OrderBy
-				org.hibernate.sql.ordering.antlr.NodeSupport.class,
-				org.hibernate.sql.ordering.antlr.OrderByFragment.class,
-				org.hibernate.sql.ordering.antlr.SortSpecification.class,
-				org.hibernate.sql.ordering.antlr.OrderingSpecification.class,
-				org.hibernate.sql.ordering.antlr.CollationSpecification.class,
-				org.hibernate.sql.ordering.antlr.SortKey.class,
+//				org.hibernate.sql.ordering.antlr.NodeSupport.class,
+//				org.hibernate.sql.ordering.antlr.OrderByFragment.class,
+//				org.hibernate.sql.ordering.antlr.SortSpecification.class,
+//				org.hibernate.sql.ordering.antlr.OrderingSpecification.class,
+//				org.hibernate.sql.ordering.antlr.CollationSpecification.class,
+//				org.hibernate.sql.ordering.antlr.SortKey.class,
 
 				//ANTLR tokens:
-				org.hibernate.hql.internal.ast.tree.SelectClause.class,
-				org.hibernate.hql.internal.ast.tree.HqlSqlWalkerNode.class,
-				org.hibernate.hql.internal.ast.tree.MethodNode.class,
-				org.hibernate.hql.internal.ast.tree.UnaryLogicOperatorNode.class,
-				org.hibernate.hql.internal.ast.tree.NullNode.class,
-				org.hibernate.hql.internal.ast.tree.IntoClause.class,
-				org.hibernate.hql.internal.ast.tree.UpdateStatement.class,
-				org.hibernate.hql.internal.ast.tree.SelectExpressionImpl.class,
-				org.hibernate.hql.internal.ast.tree.CastFunctionNode.class,
-				org.hibernate.hql.internal.ast.tree.DeleteStatement.class,
-				org.hibernate.hql.internal.ast.tree.SqlNode.class,
-				org.hibernate.hql.internal.ast.tree.SearchedCaseNode.class,
-				org.hibernate.hql.internal.ast.tree.FromElement.class,
-				org.hibernate.hql.internal.ast.tree.JavaConstantNode.class,
-				org.hibernate.hql.internal.ast.tree.SqlFragment.class,
-				org.hibernate.hql.internal.ast.tree.MapKeyNode.class,
-				org.hibernate.hql.internal.ast.tree.ImpliedFromElement.class,
-				org.hibernate.hql.internal.ast.tree.IsNotNullLogicOperatorNode.class,
-				org.hibernate.hql.internal.ast.tree.InsertStatement.class,
-				org.hibernate.hql.internal.ast.tree.UnaryArithmeticNode.class,
-				org.hibernate.hql.internal.ast.tree.CollectionFunction.class,
-				org.hibernate.hql.internal.ast.tree.BinaryLogicOperatorNode.class,
-				org.hibernate.hql.internal.ast.tree.CountNode.class,
-				org.hibernate.hql.internal.ast.tree.IsNullLogicOperatorNode.class,
-				org.hibernate.hql.internal.ast.tree.IdentNode.class,
-				org.hibernate.hql.internal.ast.tree.ParameterNode.class,
-				org.hibernate.hql.internal.ast.tree.MapEntryNode.class,
-				org.hibernate.hql.internal.ast.tree.MapValueNode.class,
-				org.hibernate.hql.internal.ast.tree.InLogicOperatorNode.class,
-				org.hibernate.hql.internal.ast.tree.IndexNode.class,
-				org.hibernate.hql.internal.ast.tree.DotNode.class,
-				org.hibernate.hql.internal.ast.tree.ResultVariableRefNode.class,
-				org.hibernate.hql.internal.ast.tree.BetweenOperatorNode.class,
-				org.hibernate.hql.internal.ast.tree.AggregateNode.class,
-				org.hibernate.hql.internal.ast.tree.QueryNode.class,
-				org.hibernate.hql.internal.ast.tree.BooleanLiteralNode.class,
-				org.hibernate.hql.internal.ast.tree.SimpleCaseNode.class,
-				org.hibernate.hql.internal.ast.tree.OrderByClause.class,
-				org.hibernate.hql.internal.ast.tree.FromClause.class,
-				org.hibernate.hql.internal.ast.tree.ConstructorNode.class,
-				org.hibernate.hql.internal.ast.tree.LiteralNode.class,
-				org.hibernate.hql.internal.ast.tree.BinaryArithmeticOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.SelectClause.class,
+//				org.hibernate.hql.internal.ast.tree.HqlSqlWalkerNode.class,
+//				org.hibernate.hql.internal.ast.tree.MethodNode.class,
+//				org.hibernate.hql.internal.ast.tree.UnaryLogicOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.NullNode.class,
+//				org.hibernate.hql.internal.ast.tree.IntoClause.class,
+//				org.hibernate.hql.internal.ast.tree.UpdateStatement.class,
+//				org.hibernate.hql.internal.ast.tree.SelectExpressionImpl.class,
+//				org.hibernate.hql.internal.ast.tree.CastFunctionNode.class,
+//				org.hibernate.hql.internal.ast.tree.DeleteStatement.class,
+//				org.hibernate.hql.internal.ast.tree.SqlNode.class,
+//				org.hibernate.hql.internal.ast.tree.SearchedCaseNode.class,
+//				org.hibernate.hql.internal.ast.tree.FromElement.class,
+//				org.hibernate.hql.internal.ast.tree.JavaConstantNode.class,
+//				org.hibernate.hql.internal.ast.tree.SqlFragment.class,
+//				org.hibernate.hql.internal.ast.tree.MapKeyNode.class,
+//				org.hibernate.hql.internal.ast.tree.ImpliedFromElement.class,
+//				org.hibernate.hql.internal.ast.tree.IsNotNullLogicOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.InsertStatement.class,
+//				org.hibernate.hql.internal.ast.tree.UnaryArithmeticNode.class,
+//				org.hibernate.hql.internal.ast.tree.CollectionFunction.class,
+//				org.hibernate.hql.internal.ast.tree.BinaryLogicOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.CountNode.class,
+//				org.hibernate.hql.internal.ast.tree.IsNullLogicOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.IdentNode.class,
+//				org.hibernate.hql.internal.ast.tree.ParameterNode.class,
+//				org.hibernate.hql.internal.ast.tree.MapEntryNode.class,
+//				org.hibernate.hql.internal.ast.tree.MapValueNode.class,
+//				org.hibernate.hql.internal.ast.tree.InLogicOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.IndexNode.class,
+//				org.hibernate.hql.internal.ast.tree.DotNode.class,
+//				org.hibernate.hql.internal.ast.tree.ResultVariableRefNode.class,
+//				org.hibernate.hql.internal.ast.tree.BetweenOperatorNode.class,
+//				org.hibernate.hql.internal.ast.tree.AggregateNode.class,
+//				org.hibernate.hql.internal.ast.tree.QueryNode.class,
+//				org.hibernate.hql.internal.ast.tree.BooleanLiteralNode.class,
+//				org.hibernate.hql.internal.ast.tree.SimpleCaseNode.class,
+//				org.hibernate.hql.internal.ast.tree.OrderByClause.class,
+//				org.hibernate.hql.internal.ast.tree.FromClause.class,
+//				org.hibernate.hql.internal.ast.tree.ConstructorNode.class,
+//				org.hibernate.hql.internal.ast.tree.LiteralNode.class,
+//				org.hibernate.hql.internal.ast.tree.BinaryArithmeticOperatorNode.class,
 
 				//Various well known needs:
 
@@ -100,8 +100,8 @@ final class StaticClassLists {
 				org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl.class,
 				EnumType.class,
 				MultipleLinesSqlCommandExtractor.class,
-				org.hibernate.hql.internal.ast.HqlToken.class,
-				org.hibernate.hql.internal.ast.tree.Node.class,
+//				org.hibernate.hql.internal.ast.HqlToken.class,
+//				org.hibernate.hql.internal.ast.tree.Node.class,
 
 		};
 	}