diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java
index 799ba7975e..e7a0ce1b36 100644
--- a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java
@@ -9,25 +9,20 @@
 import static org.opensearch.sql.spark.validator.GrammarElement.CLUSTER_BY;
 import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_FUNCTION;
 import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_VIEW;
-import static org.opensearch.sql.spark.validator.GrammarElement.CROSS_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_FUNCTION;
 import static org.opensearch.sql.spark.validator.GrammarElement.DISTRIBUTE_BY;
 import static org.opensearch.sql.spark.validator.GrammarElement.DROP_FUNCTION;
 import static org.opensearch.sql.spark.validator.GrammarElement.DROP_VIEW;
 import static org.opensearch.sql.spark.validator.GrammarElement.FILE;
-import static org.opensearch.sql.spark.validator.GrammarElement.FULL_OUTER_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.HINTS;
 import static org.opensearch.sql.spark.validator.GrammarElement.INLINE_TABLE;
 import static org.opensearch.sql.spark.validator.GrammarElement.INSERT;
-import static org.opensearch.sql.spark.validator.GrammarElement.LEFT_ANTI_JOIN;
-import static org.opensearch.sql.spark.validator.GrammarElement.LEFT_SEMI_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.LOAD;
 import static org.opensearch.sql.spark.validator.GrammarElement.MANAGE_RESOURCE;
 import static org.opensearch.sql.spark.validator.GrammarElement.MISC_FUNCTIONS;
 import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_FUNCTION;
 import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_RESOURCE;
 import static org.opensearch.sql.spark.validator.GrammarElement.RESET;
-import static org.opensearch.sql.spark.validator.GrammarElement.RIGHT_OUTER_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.SET;
 import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_FUNCTIONS;
 import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_VIEWS;
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java
index 778074e353..ca8f2b5bdd 100644
--- a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java
@@ -14,7 +14,6 @@
 import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_FUNCTION;
 import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_NAMESPACE;
 import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_VIEW;
-import static org.opensearch.sql.spark.validator.GrammarElement.CROSS_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.CSV_FUNCTIONS;
 import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_FUNCTION;
 import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_NAMESPACE;
@@ -25,12 +24,9 @@
 import static org.opensearch.sql.spark.validator.GrammarElement.DROP_NAMESPACE;
 import static org.opensearch.sql.spark.validator.GrammarElement.DROP_VIEW;
 import static org.opensearch.sql.spark.validator.GrammarElement.FILE;
-import static org.opensearch.sql.spark.validator.GrammarElement.FULL_OUTER_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.HINTS;
 import static org.opensearch.sql.spark.validator.GrammarElement.INLINE_TABLE;
 import static org.opensearch.sql.spark.validator.GrammarElement.INSERT;
-import static org.opensearch.sql.spark.validator.GrammarElement.LEFT_ANTI_JOIN;
-import static org.opensearch.sql.spark.validator.GrammarElement.LEFT_SEMI_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.LOAD;
 import static org.opensearch.sql.spark.validator.GrammarElement.MANAGE_RESOURCE;
 import static org.opensearch.sql.spark.validator.GrammarElement.MISC_FUNCTIONS;
@@ -39,7 +35,6 @@
 import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_TABLE;
 import static org.opensearch.sql.spark.validator.GrammarElement.REPAIR_TABLE;
 import static org.opensearch.sql.spark.validator.GrammarElement.RESET;
-import static org.opensearch.sql.spark.validator.GrammarElement.RIGHT_OUTER_JOIN;
 import static org.opensearch.sql.spark.validator.GrammarElement.SET;
 import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_COLUMNS;
 import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_CREATE_TABLE;