diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java
index 9ec0fb0109..d50503418e 100644
--- a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java
@@ -9,15 +9,12 @@
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AddTableColumnsContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AddTablePartitionContext;
-import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterClusterByContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterTableAlterColumnContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterViewQueryContext;
-import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterViewSchemaBindingContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AnalyzeContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AnalyzeTablesContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CacheTableContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ClearCacheContext;
-import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ClusterBySpecContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateNamespaceContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateTableContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateTableLikeContext;
@@ -81,7 +78,6 @@
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.TransformClauseContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.TruncateTableContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.UncacheTableContext;
-import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.UnsetNamespacePropertiesContext;
 import org.opensearch.sql.spark.antlr.parser.SqlBaseParserBaseVisitor;
 
 /** This visitor validate grammar using GrammarElementValidator */
@@ -101,12 +97,6 @@ public Void visitSetNamespaceProperties(SetNamespacePropertiesContext ctx) {
     return super.visitSetNamespaceProperties(ctx);
   }
 
-  @Override
-  public Void visitUnsetNamespaceProperties(UnsetNamespacePropertiesContext ctx) {
-    validateAllowed(GrammarElement.ALTER_NAMESPACE);
-    return super.visitUnsetNamespaceProperties(ctx);
-  }
-
   @Override
   public Void visitAddTableColumns(AddTableColumnsContext ctx) {
     validateAllowed(GrammarElement.ALTER_NAMESPACE);
@@ -173,12 +163,6 @@ public Void visitRecoverPartitions(RecoverPartitionsContext ctx) {
     return super.visitRecoverPartitions(ctx);
   }
 
-  @Override
-  public Void visitAlterClusterBy(AlterClusterByContext ctx) {
-    validateAllowed(GrammarElement.ALTER_NAMESPACE);
-    return super.visitAlterClusterBy(ctx);
-  }
-
   @Override
   public Void visitSetNamespaceLocation(SetNamespaceLocationContext ctx) {
     validateAllowed(GrammarElement.ALTER_NAMESPACE);
@@ -191,12 +175,6 @@ public Void visitAlterViewQuery(AlterViewQueryContext ctx) {
     return super.visitAlterViewQuery(ctx);
   }
 
-  @Override
-  public Void visitAlterViewSchemaBinding(AlterViewSchemaBindingContext ctx) {
-    validateAllowed(GrammarElement.ALTER_VIEW);
-    return super.visitAlterViewSchemaBinding(ctx);
-  }
-
   @Override
   public Void visitRenameTable(RenameTableContext ctx) {
     if (ctx.VIEW() != null) {
@@ -337,12 +315,6 @@ public Void visitCtes(CtesContext ctx) {
     return super.visitCtes(ctx);
   }
 
-  @Override
-  public Void visitClusterBySpec(ClusterBySpecContext ctx) {
-    validateAllowed(GrammarElement.CLUSTER_BY);
-    return super.visitClusterBySpec(ctx);
-  }
-
   @Override
   public Void visitQueryOrganization(QueryOrganizationContext ctx) {
     if (ctx.CLUSTER() != null) {