diff --git a/stac_fastapi/core/stac_fastapi/core/extensions/aggregation.py b/stac_fastapi/core/stac_fastapi/core/extensions/aggregation.py
index fc8a1379..ddab6829 100644
--- a/stac_fastapi/core/stac_fastapi/core/extensions/aggregation.py
+++ b/stac_fastapi/core/stac_fastapi/core/extensions/aggregation.py
@@ -92,11 +92,6 @@ class EsAsyncAggregationClient(AsyncBaseAggregationClient):
             "data_type": "frequency_distribution",
             "frequency_distribution_data_type": "string",
         },
-        # {
-        #     "name": "geometry_geohex_grid_frequency",
-        #     "data_type": "frequency_distribution",
-        #     "frequency_distribution_data_type": "string",
-        # },
         {
             "name": "geometry_geotile_grid_frequency",
             "data_type": "frequency_distribution",
@@ -485,12 +480,6 @@ async def aggregate(
             self.MAX_GEOHASH_PRECISION,
         )
 
-        # geometry_geohex_grid_frequency_precision = self.extract_precision(
-        # aggregate_request.geometry_geohex_grid_frequency_precision,
-        # 0,
-        # self.MAX_GEOHEX_PRECISION
-        # )
-
         geometry_geotile_grid_precision = self.extract_precision(
             aggregate_request.geometry_geotile_grid_frequency_precision,
             0,
@@ -506,7 +495,6 @@ async def aggregate(
                 centroid_geohex_grid_precision,
                 centroid_geotile_grid_precision,
                 geometry_geohash_grid_precision,
-                # geometry_geohex_grid_precision,
                 geometry_geotile_grid_precision,
             )
         except Exception as error:
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py
index f2ec0134..348b8784 100644
--- a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py
+++ b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py
@@ -644,7 +644,6 @@ async def aggregate(
         centroid_geohex_grid_precision: int,
         centroid_geotile_grid_precision: int,
         geometry_geohash_grid_precision: int,
-        # geometry_geohex_grid_precision: int,
         geometry_geotile_grid_precision: int,
         ignore_unavailable: Optional[bool] = True,
     ):
@@ -705,7 +704,6 @@ async def aggregate(
             k: v for k, v in agg_2_es.items() if k in aggregations
         }
 
-        # centroid
         if "centroid_geohash_grid_frequency" in aggregations:
             search_body["aggregations"]["centroid_geohash_grid_frequency"] = {
                 "geohash_grid": {
@@ -730,7 +728,6 @@ async def aggregate(
                 }
             }
 
-        # geometry
         if "geometry_geohash_grid_frequency" in aggregations:
             search_body["aggregations"]["geometry_geohash_grid_frequency"] = {
                 "geohash_grid": {
@@ -739,14 +736,6 @@ async def aggregate(
                 }
             }
 
-        # if "geometry_geohex_grid_frequency" in aggregations:
-        #     search_body["aggregations"]["geometry_geohex_grid_frequency"] = {
-        #         "geohex_grid": {
-        #             "field": "geometry",
-        #             "precision": geometry_geohex_grid_precision,
-        #         }
-        #     }
-
         if "geometry_geotile_grid_frequency" in aggregations:
             search_body["aggregations"]["geometry_geotile_grid_frequency"] = {
                 "geotile_grid": {
diff --git a/stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py b/stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py
index 49c9659d..1a0e7c85 100644
--- a/stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py
+++ b/stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py
@@ -676,7 +676,6 @@ async def aggregate(
         centroid_geohex_grid_precision: int,
         centroid_geotile_grid_precision: int,
         geometry_geohash_grid_precision: int,
-        # geometry_geohex_grid_precision: int,
         geometry_geotile_grid_precision: int,
         ignore_unavailable: Optional[bool] = True,
     ):
@@ -769,14 +768,6 @@ async def aggregate(
                 }
             }
 
-        # if "geometry_geohex_grid_frequency" in aggregations:
-        #     search_body["aggregations"]["geometry_geohex_grid_frequency"] = {
-        #         "geohex_grid": {
-        #             "field": "geometry",
-        #             "precision": geometry_geohex_grid_precision,
-        #         }
-        #     }
-
         if "geometry_geotile_grid_frequency" in aggregations:
             search_body["aggregations"]["geometry_geotile_grid_frequency"] = {
                 "geotile_grid": {