diff --git a/src/backend/distributed/planner/multi_logical_planner.c b/src/backend/distributed/planner/multi_logical_planner.c
index a8eeb08c0..d1e2e6bca 100644
--- a/src/backend/distributed/planner/multi_logical_planner.c
+++ b/src/backend/distributed/planner/multi_logical_planner.c
@@ -520,23 +520,6 @@ CompositeFieldRecursive(Expr *expression, Query *query)
 
 		compositeField = CompositeFieldRecursive(joinColumn, query);
 	}
-#if PG_VERSION_NUM >= PG_VERSION_18
-	else if (rangeTableEntry->rtekind == RTE_GROUP)
-	{
-		/* PG 18 synthetic GROUP RTE: each groupexprs[i] matches varattno=i+1 */
-		List *gexprs = rangeTableEntry->groupexprs;
-		AttrNumber grpIndex = candidateColumn->varattno - 1;
-
-		if (grpIndex >= 0 && grpIndex < list_length(gexprs))
-		{
-			Expr *grpExpr = (Expr *) list_nth(gexprs, grpIndex);
-			compositeField = CompositeFieldRecursive(grpExpr, query);
-		}
-
-		/* else leave compositeField = NULL */
-	}
-#endif
-
 
 	return compositeField;
 }
@@ -1197,9 +1180,6 @@ HasComplexRangeTableType(Query *queryTree)
 			rangeTableEntry->rtekind != RTE_SUBQUERY &&
 			rangeTableEntry->rtekind != RTE_FUNCTION &&
 			rangeTableEntry->rtekind != RTE_VALUES &&
-#if PG_VERSION_NUM >= PG_VERSION_18
-    		rangeTableEntry->rtekind != RTE_GROUP   &&
-#endif			
 			!IsJsonTableRTE(rangeTableEntry))
 		{
 			hasComplexRangeTableType = true;
diff --git a/src/backend/distributed/planner/multi_router_planner.c b/src/backend/distributed/planner/multi_router_planner.c
index 6e22f970f..19d386343 100644
--- a/src/backend/distributed/planner/multi_router_planner.c
+++ b/src/backend/distributed/planner/multi_router_planner.c
@@ -1027,9 +1027,6 @@ ModifyQuerySupported(Query *queryTree, Query *originalQuery, bool multiShardQuer
 		}
 		else if (rangeTableEntry->rtekind == RTE_VALUES ||
 				 rangeTableEntry->rtekind == RTE_RESULT
-#if PG_VERSION_NUM >= PG_VERSION_18
-				 || rangeTableEntry->rtekind == RTE_GROUP   /* Accept synthetic GROUP */
-#endif
 				 )
 		{
 			/* do nothing, this type is supported */