diff --git a/docs/reference/mapping/params.asciidoc b/docs/reference/mapping/params.asciidoc
index 5134ab6733a..e7d2d7ac0c8 100644
--- a/docs/reference/mapping/params.asciidoc
+++ b/docs/reference/mapping/params.asciidoc
@@ -15,15 +15,11 @@ The following mapping parameters are common to some or all field datatypes:
 * <<dynamic,`dynamic`>>
 * <<enabled,`enabled`>>
 * <<fielddata,`fielddata`>>
-* <<geohash,`geohash`>>
-* <<geohash-precision,`geohash_precision`>>
-* <<geohash-prefix,`geohash_prefix`>>
 * <<mapping-date-format,`format`>>
 * <<ignore-above,`ignore_above`>>
 * <<ignore-malformed,`ignore_malformed`>>
 * <<include-in-all,`include_in_all`>>
 * <<index-options,`index_options`>>
-* <<lat-lon,`lat_lon`>>
 * <<mapping-index,`index`>>
 * <<multi-fields,`fields`>>
 * <<norms,`norms`>>
@@ -54,12 +50,6 @@ include::params/fielddata.asciidoc[]
 
 include::params/format.asciidoc[]
 
-include::params/geohash.asciidoc[]
-
-include::params/geohash-precision.asciidoc[]
-
-include::params/geohash-prefix.asciidoc[]
-
 include::params/ignore-above.asciidoc[]
 
 include::params/ignore-malformed.asciidoc[]
@@ -70,8 +60,6 @@ include::params/index.asciidoc[]
 
 include::params/index-options.asciidoc[]
 
-include::params/lat-lon.asciidoc[]
-
 include::params/multi-fields.asciidoc[]
 
 include::params/norms.asciidoc[]
diff --git a/docs/reference/mapping/types/geo-point.asciidoc b/docs/reference/mapping/types/geo-point.asciidoc
index 6dbd224c4ee..a839117c7c5 100644
--- a/docs/reference/mapping/types/geo-point.asciidoc
+++ b/docs/reference/mapping/types/geo-point.asciidoc
@@ -100,32 +100,11 @@ The following parameters are accepted by `geo_point` fields:
 
 [horizontal]
 
-<<geohash,`geohash`>>::
-
-    Should the geo-point also be indexed as a geohash in the `.geohash`
-    sub-field? Defaults to `false`, unless `geohash_prefix` is `true`.
-    deprecated[2.4]
-
-<<geohash-precision,`geohash_precision`>>::
-
-    The maximum length of the geohash to use for the `geohash` and
-    `geohash_prefix` options. deprecated[2.4]
-
-<<geohash-prefix,`geohash_prefix`>>::
-
-    Should the geo-point also be indexed as a geohash plus all its prefixes?
-    Defaults to `false`. deprecated[2.4]
-
 <<ignore-malformed,`ignore_malformed`>>::
 
     If `true`, malformed geo-points are ignored. If `false` (default),
     malformed geo-points throw an exception and reject the whole document.
 
-<<lat-lon,`lat_lon`>>::
-
-    Should the geo-point also be indexed as `.lat` and `.lon` sub-fields?
-    Accepts `true` and `false` (default). deprecated[2.3]
-
 ==== Using geo-points in scripts
 
 When accessing the value of a geo-point in a script, the value is returned as
diff --git a/docs/reference/search/suggesters/context-suggest.asciidoc b/docs/reference/search/suggesters/context-suggest.asciidoc
index 293e8bb573c..66e19eaadb5 100644
--- a/docs/reference/search/suggesters/context-suggest.asciidoc
+++ b/docs/reference/search/suggesters/context-suggest.asciidoc
@@ -220,7 +220,6 @@ at index time. At query time, suggestions can be filtered and boosted if they ar
 a certain distance of a specified geo location.
 
 Internally, geo points are encoded as geohashes with the specified precision.
-See <<geohash>> for more background details.
 
 [float]
 ===== Geo Mapping