diff --git a/server/src/main/java/org/apache/lucene/document/XLatLonShape.java b/server/src/main/java/org/apache/lucene/document/XLatLonShape.java
index 4fd92f4508c..87ebb6a753f 100644
--- a/server/src/main/java/org/apache/lucene/document/XLatLonShape.java
+++ b/server/src/main/java/org/apache/lucene/document/XLatLonShape.java
@@ -52,7 +52,6 @@ import static org.apache.lucene.geo.GeoEncodingUtils.encodeLongitude;
  * @see PointValues
  * @see LatLonDocValuesField
  *
- * @lucene.experimental
  */
 public class XLatLonShape {
   public static final int BYTES = LatLonPoint.BYTES;
diff --git a/server/src/main/java/org/apache/lucene/document/XLatLonShapeBoundingBoxQuery.java b/server/src/main/java/org/apache/lucene/document/XLatLonShapeBoundingBoxQuery.java
index bcf664719b7..8e30302225f 100644
--- a/server/src/main/java/org/apache/lucene/document/XLatLonShapeBoundingBoxQuery.java
+++ b/server/src/main/java/org/apache/lucene/document/XLatLonShapeBoundingBoxQuery.java
@@ -26,7 +26,6 @@ import org.apache.lucene.index.PointValues.Relation;
  * <p>The field must be indexed using
  * {@link XLatLonShape#createIndexableFields} added per document.
  *
- *  @lucene.experimental
  **/
 final class XLatLonShapeBoundingBoxQuery extends XLatLonShapeQuery {
   final XRectangle2D rectangle2D;
diff --git a/server/src/main/java/org/apache/lucene/document/XLatLonShapeLineQuery.java b/server/src/main/java/org/apache/lucene/document/XLatLonShapeLineQuery.java
index 90905e0d83f..4bbb077303e 100644
--- a/server/src/main/java/org/apache/lucene/document/XLatLonShapeLineQuery.java
+++ b/server/src/main/java/org/apache/lucene/document/XLatLonShapeLineQuery.java
@@ -41,7 +41,6 @@ import java.util.Arrays;
  * <p>The field must be indexed using
  * {@link XLatLonShape#createIndexableFields} added per document.
  *
- *  @lucene.experimental
  **/
 final class XLatLonShapeLineQuery extends XLatLonShapeQuery {
   final Line[] lines;
diff --git a/server/src/main/java/org/apache/lucene/document/XLatLonShapePolygonQuery.java b/server/src/main/java/org/apache/lucene/document/XLatLonShapePolygonQuery.java
index 5e97828aae2..5b67d8c0bc9 100644
--- a/server/src/main/java/org/apache/lucene/document/XLatLonShapePolygonQuery.java
+++ b/server/src/main/java/org/apache/lucene/document/XLatLonShapePolygonQuery.java
@@ -31,7 +31,6 @@ import java.util.Arrays;
  * <p>The field must be indexed using
  * {@link XLatLonShape#createIndexableFields} added per document.
  *
- *  @lucene.experimental
  **/
 final class XLatLonShapePolygonQuery extends XLatLonShapeQuery {
   final Polygon[] polygons;
diff --git a/server/src/main/java/org/apache/lucene/document/XLatLonShapeQuery.java b/server/src/main/java/org/apache/lucene/document/XLatLonShapeQuery.java
index 7aded1337e4..f4c67872cdc 100644
--- a/server/src/main/java/org/apache/lucene/document/XLatLonShapeQuery.java
+++ b/server/src/main/java/org/apache/lucene/document/XLatLonShapeQuery.java
@@ -45,7 +45,6 @@ import java.util.Objects;
  *
  * Note: this class implements the majority of the INTERSECTS, WITHIN, DISJOINT relation logic
  *
- * @lucene.experimental
  **/
 abstract class XLatLonShapeQuery extends Query {
   /** field name */
diff --git a/server/src/main/java/org/apache/lucene/geo/XRectangle2D.java b/server/src/main/java/org/apache/lucene/geo/XRectangle2D.java
index af06d0a0e39..0267ba29b86 100644
--- a/server/src/main/java/org/apache/lucene/geo/XRectangle2D.java
+++ b/server/src/main/java/org/apache/lucene/geo/XRectangle2D.java
@@ -38,7 +38,6 @@ import static org.apache.lucene.geo.GeoUtils.orient;
 /**
  * 2D rectangle implementation containing spatial logic.
  *
- * @lucene.internal
  */
 public class XRectangle2D {
   final byte[] bbox;
diff --git a/server/src/main/java/org/apache/lucene/geo/XTessellator.java b/server/src/main/java/org/apache/lucene/geo/XTessellator.java
index 416b501202b..48091439ba9 100644
--- a/server/src/main/java/org/apache/lucene/geo/XTessellator.java
+++ b/server/src/main/java/org/apache/lucene/geo/XTessellator.java
@@ -64,7 +64,6 @@ import static org.apache.lucene.geo.GeoUtils.orient;
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  *
- * @lucene.experimental
  */
 public final class XTessellator {
   // this is a dumb heuristic to control whether we cut over to sorted morton values