diff --git a/docs/querying/functions.md b/docs/querying/functions.md
index 74e674028..43e4e9354 100644
--- a/docs/querying/functions.md
+++ b/docs/querying/functions.md
@@ -60,14 +60,6 @@ elements in `v` to have an upper limit of `max`.
 `clamp_min(v instant-vector, min scalar)` clamps the sample values of all
 elements in `v` to have a lower limit of `min`.
 
-## `count_scalar()`
-
-`count_scalar(v instant-vector)` returns the number of elements in a time series
-vector as a scalar. This is in contrast to the `count()`
-[aggregation operator](operators.md#aggregation-operators), which
-always returns a vector (an empty one if the input vector is empty) and allows
-grouping by labels via a `by` clause.
-
 ## `day_of_month()`
 
 `day_of_month(v=vector(time()) instant-vector)` returns the day of the month
@@ -109,11 +101,6 @@ vector `v`, using [simple linear regression](http://en.wikipedia.org/wiki/Simple
 
 `deriv` should only be used with gauges.
 
-## `drop_common_labels()`
-
-`drop_common_labels(instant-vector)` drops all labels that have the same name
-and value across all series in the input vector.
-
 ## `exp()`
 
 `exp(v instant-vector)` calculates the exponential function for all elements in `v`.
diff --git a/docs/querying/operators.md b/docs/querying/operators.md
index 7aa7a6b79..06fe82d84 100644
--- a/docs/querying/operators.md
+++ b/docs/querying/operators.md
@@ -193,15 +193,13 @@ vector of fewer elements with aggregated values:
 These operators can either be used to aggregate over **all** label dimensions
 or preserve distinct dimensions by including a `without` or `by` clause.
 
-    <aggr-op>([parameter,] <vector expression>) [without|by (<label list>)] [keep_common]
+    <aggr-op>([parameter,] <vector expression>) [without|by (<label list>)]
 
 `parameter` is only required for `count_values`, `quantile`, `topk` and
 `bottomk`. `without` removes the listed labels from the result vector, while
 all other labels are preserved the output. `by` does the opposite and drops
 labels that are not listed in the `by` clause, even if their label values are
-identical between all elements of the vector. The `keep_common` clause allows
-keeping those extra labels (labels that are identical between elements, but not
-in the `by` clause).
+identical between all elements of the vector.
 
 `count_values` outputs one time series per unique sample value. Each series has
 an additional label. The name of that label is given by the aggregation