diff --git a/en/access-logging.html b/en/access-logging.html
index 753146603d..8e575d8ca4 100644
--- a/en/access-logging.html
+++ b/en/access-logging.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: Access Logging
-redirect_from:
-- /documentation/access-logging.html
 ---
 
 <p>
diff --git a/en/annotations.html b/en/annotations.html
index 81e4dda9c7..878cc38bd7 100644
--- a/en/annotations.html
+++ b/en/annotations.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Annotations API"
-redirect_from:
-- /documentation/annotations.html
 ---
 
 <p>
diff --git a/en/api.html b/en/api.html
index d7e68e1c93..cb77c2d56c 100644
--- a/en/api.html
+++ b/en/api.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa API and interfaces"
-redirect_from:
-- /documentation/api.html
 ---
 
 <h2 id="deployment-and-configuration">Deployment and configuration</h2>
diff --git a/en/application-packages.html b/en/application-packages.html
index 566cfc4d7e..1af8b87c8a 100644
--- a/en/application-packages.html
+++ b/en/application-packages.html
@@ -2,9 +2,7 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Application Packages"
 redirect_from:
-- /documentation/cloudconfig/application-packages.html
 - /en/cloudconfig/application-packages.html
-- /documentation/cloudconfig/config-introduction.html
 - /en/cloudconfig/config-introduction.html
 - /en/config-introduction.html
 ---
diff --git a/en/approximate-nn-hnsw.md b/en/approximate-nn-hnsw.md
index 2e15ec6be2..2b54ed5429 100644
--- a/en/approximate-nn-hnsw.md
+++ b/en/approximate-nn-hnsw.md
@@ -2,8 +2,6 @@
 # Copyright Vespa.ai. All rights reserved. 
 title: "Approximate Nearest Neighbor Search using HNSW Index"
 keywords: "ann, approximate nearest neighbor"
-redirect_from:
-- /documentation/approximate-nn-hnsw.html
 ---
 
 For an introduction to nearest neighbor search, see [nearest neighbor search](nearest-neighbor-search.html) documentation, 
diff --git a/en/attributes.html b/en/attributes.html
index 4f8ca3c012..3abec416e4 100644
--- a/en/attributes.html
+++ b/en/attributes.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Attributes"
-redirect_from:
-- /documentation/attributes.html
 ---
 
 <p>
diff --git a/en/boolean-library.html b/en/boolean-library.html
index 6c146823f1..6a96bd8837 100644
--- a/en/boolean-library.html
+++ b/en/boolean-library.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Predicate Search Java Library"
-redirect_from:
-- /documentation/boolean-library.html
 ---
 
 <p>
diff --git a/en/build-install-vespa.html b/en/build-install-vespa.html
index 0827bea529..356e16b96e 100644
--- a/en/build-install-vespa.html
+++ b/en/build-install-vespa.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Build / install Vespa"
-redirect_from:
-- /documentation/build-install-vespa.html
 ---
 
 <p>
diff --git a/en/components/bundles.html b/en/components/bundles.html
index fe496d1a7e..7ae75d8eaf 100644
--- a/en/components/bundles.html
+++ b/en/components/bundles.html
@@ -2,11 +2,8 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Bundles"
 redirect_from:
-- /documentation/jdisc/developing-osgi-bundles.html
 - /en/jdisc/developing-osgi-bundles.html
-- /documentation/jdisc/bundle-troubleshooting.html
 - /en/jdisc/bundle-troubleshooting.html
-- /documentation/bundle-plugin.html
 - /en/bundle-plugin.html
 ---
 
diff --git a/en/components/chained-components.html b/en/components/chained-components.html
index b72dc312d8..9c917b6d62 100644
--- a/en/components/chained-components.html
+++ b/en/components/chained-components.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Chained Components"
 redirect_from:
-- /documentation/chained-components.html
 - /en/chained-components.html
 ---
 
diff --git a/en/concrete-documents.html b/en/concrete-documents.html
index dbbf93a127..16e48d9afd 100644
--- a/en/concrete-documents.html
+++ b/en/concrete-documents.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Concrete document types"
-redirect_from:
-- /documentation/concrete-documents.html
 ---
 
 <p>
diff --git a/en/configuring-components.html b/en/configuring-components.html
index fb71f608df..139dd4819d 100644
--- a/en/configuring-components.html
+++ b/en/configuring-components.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Configuring Java components"
-redirect_from:
-- /documentation/configuring-components.html
 ---
 
 <p>
diff --git a/en/content/buckets.html b/en/content/buckets.html
index 1a9ccbf97c..0a326da4fb 100644
--- a/en/content/buckets.html
+++ b/en/content/buckets.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Buckets"
-redirect_from:
-- /documentation/content/buckets.html
 ---
 
 <p>
diff --git a/en/content/consistency.md b/en/content/consistency.md
index e2a7e715c7..a1a99b5c39 100644
--- a/en/content/consistency.md
+++ b/en/content/consistency.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Consistency Model"
-redirect_from:
-- /documentation/content/consistency.html
 ---
 
 Vespa offers configurable data redundancy with eventual consistency across replicas.
diff --git a/en/content/content-nodes.html b/en/content/content-nodes.html
index 4a2ea7efb0..dbaa15c26d 100644
--- a/en/content/content-nodes.html
+++ b/en/content/content-nodes.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Content nodes, states and metrics"
-redirect_from:
-- /documentation/content/content-nodes.html
 ---
 
 <img src="/assets/img/elastic-feed.svg" alt="Content cluster overview" width="540" height="auto"/>
diff --git a/en/content/idealstate.html b/en/content/idealstate.html
index 987f1c30ce..a6b50e84d1 100644
--- a/en/content/idealstate.html
+++ b/en/content/idealstate.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Distribution Algorithm"
-redirect_from:
-- /documentation/content/idealstate.html
 ---
 
 <p>
diff --git a/en/contributing.md b/en/contributing.md
index 3d56def98d..9d2d8c35e9 100644
--- a/en/contributing.md
+++ b/en/contributing.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Contributing to Vespa"
-redirect_from:
-- /documentation/contributing.html
 ---
 
 Contributions to [Vespa](http://github.com/vespa-engine/vespa)
diff --git a/en/contributing/cloudconfig-model-plugins.html b/en/contributing/cloudconfig-model-plugins.html
index 160da3bf78..3f1396d056 100644
--- a/en/contributing/cloudconfig-model-plugins.html
+++ b/en/contributing/cloudconfig-model-plugins.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Developing Cloud Config Model Plugins"
 redirect_from:
-- /documentation/cloudconfig/cloudconfig-model-plugins.html
 - /en/cloudconfig/cloudconfig-model-plugins.html
 ---
 
diff --git a/en/contributing/configapi-dev-cpp.html b/en/contributing/configapi-dev-cpp.html
index df12ce5204..7e0c5baea4 100644
--- a/en/contributing/configapi-dev-cpp.html
+++ b/en/contributing/configapi-dev-cpp.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Using the C++ Cloud config API"
 redirect_from:
-- /documentation/cloudconfig/configapi-dev-cpp.html
 - /en/cloudconfig/configapi-dev-cpp.html
 ---
 
diff --git a/en/contributing/configapi-dev-java.html b/en/contributing/configapi-dev-java.html
index 36f3a826e2..546ae00064 100644
--- a/en/contributing/configapi-dev-java.html
+++ b/en/contributing/configapi-dev-java.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Developing with the Java Cloud Config API"
 redirect_from:
-- /documentation/cloudconfig/configapi-dev-java.html
 - /en/cloudconfig/configapi-dev-java.html
 ---
 
diff --git a/en/contributing/configapi-dev.html b/en/contributing/configapi-dev.html
index dfa63842b6..c27bf8c5fe 100644
--- a/en/contributing/configapi-dev.html
+++ b/en/contributing/configapi-dev.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Cloud Config API"
 redirect_from:
-- /documentation/cloudconfig/configapi-dev.html
 - /en/cloudconfig/configapi-dev.html
 ---
 
diff --git a/en/cross-encoders.md b/en/cross-encoders.md
index bab02b7742..752cd88a4a 100644
--- a/en/cross-encoders.md
+++ b/en/cross-encoders.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking With Transformer Cross-Encoder Models"
-redirect_from:
-- /documentation/cross-encoders.html
 ---
 
 [Cross-Encoder Transformer](https://blog.vespa.ai/pretrained-transformer-language-models-for-search-part-4/) 
diff --git a/en/developer-guide.html b/en/developer-guide.html
index dc1c5818fc..91811c3272 100644
--- a/en/developer-guide.html
+++ b/en/developer-guide.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Developer Guide"
-redirect_from:
-- /documentation/developer-guide.html
 ---
 
 <img src="/assets/img/vespa-overview.svg" width="825px" height="auto" alt="Vespa Overview" />
diff --git a/en/developing-web-services.html b/en/developing-web-services.html
index 4b939c1cc3..9f5da1dacf 100644
--- a/en/developing-web-services.html
+++ b/en/developing-web-services.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Developing Web Service Applications"
-redirect_from:
-- /documentation/developing-web-services.html
 ---
 
 <p>
diff --git a/en/document-api-guide.html b/en/document-api-guide.html
index d0e5603295..4652de6434 100644
--- a/en/document-api-guide.html
+++ b/en/document-api-guide.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Document API"
-redirect_from:
-- /documentation/document-api-guide.html
 ---
 
 <p>
diff --git a/en/document-processing.html b/en/document-processing.html
index 1602b50132..32ee00f852 100644
--- a/en/document-processing.html
+++ b/en/document-processing.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Document Processing"
-redirect_from:
-- /documentation/document-processing.html
 ---
 
 <p>
diff --git a/en/document-summaries.html b/en/document-summaries.html
index f98ef09b28..42a278841a 100644
--- a/en/document-summaries.html
+++ b/en/document-summaries.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Document Summaries"
-redirect_from:
-- /documentation/document-summaries.html
 ---
 
 <p>A <i>document summary</i> is the information that is shown for each document in a query result.
diff --git a/en/document-v1-api-guide.html b/en/document-v1-api-guide.html
index ce21cde0b6..cdd256bd2c 100644
--- a/en/document-v1-api-guide.html
+++ b/en/document-v1-api-guide.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "/document/v1 API guide"
-redirect_from:
-- /documentation/document-v1-api-guide.html
 ---
 
 <p>Use the <em>/document/v1/</em> API to read, write, update and delete documents.</p>
diff --git a/en/documents.html b/en/documents.html
index 736f2e86a8..429173cb01 100644
--- a/en/documents.html
+++ b/en/documents.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Documents"
-redirect_from:
-- /documentation/documents.html
 ---
 
 <p>
diff --git a/en/elasticity.html b/en/elasticity.html
index d031aa4e13..af2706e45a 100644
--- a/en/elasticity.html
+++ b/en/elasticity.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Content Cluster Elasticity"
 redirect_from:
-- /documentation/elastic-vespa.html
 - /en/elastic-vespa.html
 ---
 
diff --git a/en/embedding.html b/en/embedding.html
index 30d0600289..8a9e5b492a 100644
--- a/en/embedding.html
+++ b/en/embedding.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Embedding"
-redirect_from:
-- /documentation/embedding.html
 ---
 
 <p>
diff --git a/en/faq.md b/en/faq.md
index 4f4d6522de..71d971f34a 100644
--- a/en/faq.md
+++ b/en/faq.md
@@ -2,8 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: FAQ - frequently asked questions
 style: faq
-redirect_from:
-- /documentation/faq.html
 ---
 
 Refer to [Vespa Support](https://vespa.ai/support) for more support options.
diff --git a/en/features.html b/en/features.html
index 6b22b92374..6e2d7a73ac 100644
--- a/en/features.html
+++ b/en/features.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Features"
-redirect_from:
-- /documentation/features.html
 ---
 
 <h2 id="what-is-vespa">What is Vespa?</h2>
diff --git a/en/federation.html b/en/federation.html
index c636c56c3f..ea537ce1b4 100644
--- a/en/federation.html
+++ b/en/federation.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Federation"
-redirect_from:
-- /documentation/federation.html
 ---
 
 <img src="/assets/img/federation-simple.svg" width="600px" height="auto" alt="Federation example">
diff --git a/en/geo-search.html b/en/geo-search.html
index 5f4bf78b14..3959cd945f 100644
--- a/en/geo-search.html
+++ b/en/geo-search.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Geo Search"
-redirect_from:
-- /documentation/geo-search.html
 ---
 
 <p>
diff --git a/en/getting-started-ranking.md b/en/getting-started-ranking.md
index 4bc81a05d8..bb3c9ec611 100644
--- a/en/getting-started-ranking.md
+++ b/en/getting-started-ranking.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Getting started with ranking"
-redirect_from:
-- /documentation/getting-started-ranking.html
 ---
 
 Learn how [ranking](ranking.html) works in Vespa by using the open [query API](query-api.html) of
diff --git a/en/getting-started.html b/en/getting-started.html
index 0d036ef82f..134c27d1f8 100644
--- a/en/getting-started.html
+++ b/en/getting-started.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Getting Started"
 redirect_from:
-- /documentation/getting-started.html
 - /en/vespa-quick-start-vagrant.html
 ---
 
diff --git a/en/graceful-degradation.html b/en/graceful-degradation.html
index 08286f783b..7fb36bded5 100644
--- a/en/graceful-degradation.html
+++ b/en/graceful-degradation.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Graceful Query Coverage Degradation"
-redirect_from:
-- /documentation/graceful-degradation.html
 ---
 
 <p>
diff --git a/en/grouping.html b/en/grouping.html
index 99b85dd420..eb1f0f7d04 100644
--- a/en/grouping.html
+++ b/en/grouping.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Grouping Information in Results"
-redirect_from:
-- /documentation/grouping.html
 ---
 
 <script>
diff --git a/en/indexing.html b/en/indexing.html
index 95d00f4cf2..ede96423c2 100644
--- a/en/indexing.html
+++ b/en/indexing.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Indexing"
-redirect_from:
-- /documentation/indexing.html
 ---
 
 <p>
diff --git a/en/introduction-to-documentation.html b/en/introduction-to-documentation.html
index 0738283f22..cb8c2e2ac6 100644
--- a/en/introduction-to-documentation.html
+++ b/en/introduction-to-documentation.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Documentation Conventions"
-redirect_from:
-- /documentation/introduction-to-documentation.html
 ---
 
 <p>
diff --git a/en/jdisc/container-components.html b/en/jdisc/container-components.html
index 403dc5c462..21b01f068f 100644
--- a/en/jdisc/container-components.html
+++ b/en/jdisc/container-components.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Container Components"
-redirect_from:
-- /documentation/jdisc/container-components.html
 ---
 
 <p>
diff --git a/en/jdisc/developing-request-handlers.html b/en/jdisc/developing-request-handlers.html
index c82ef098d9..af1dbe61b8 100644
--- a/en/jdisc/developing-request-handlers.html
+++ b/en/jdisc/developing-request-handlers.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Developing request handlers"
-redirect_from:
-- /documentation/jdisc/developing-request-handlers.html
 ---
 
 <p>
diff --git a/en/jdisc/http-api-tutorial.html b/en/jdisc/http-api-tutorial.html
index 3dff379841..c08bcb7870 100644
--- a/en/jdisc/http-api-tutorial.html
+++ b/en/jdisc/http-api-tutorial.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Building an HTTP API using request handlers and processors"
-redirect_from:
-- /documentation/jdisc/http-api-tutorial.html
 ---
 
 <p>
diff --git a/en/jdisc/http-server-and-filters.html b/en/jdisc/http-server-and-filters.html
index fa0b14dedb..6300088730 100644
--- a/en/jdisc/http-server-and-filters.html
+++ b/en/jdisc/http-server-and-filters.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Configuring Http Servers and Filters"
-redirect_from:
-- /documentation/jdisc/http-server-and-filters.html
 ---
 
 <p>
diff --git a/en/jdisc/index.html b/en/jdisc/index.html
index 815ca90b45..20967d2bed 100644
--- a/en/jdisc/index.html
+++ b/en/jdisc/index.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Java Data Intensive Serving Container - JDisc"
-redirect_from:
-- /documentation/jdisc/index.html
 ---
 
 <p>Vespa's Java container - JDisc, hosts all application components as well as the stateless logic of Vespa itself.
diff --git a/en/jdisc/injecting-components.html b/en/jdisc/injecting-components.html
index ccb6757f03..f737c70b5b 100644
--- a/en/jdisc/injecting-components.html
+++ b/en/jdisc/injecting-components.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Component Injection"
-redirect_from:
-- /documentation/jdisc/injecting-components.html
 ---
 
 <!-- ToDo: integrate with reference/container-components.html  -->
diff --git a/en/jdisc/pluggable-frameworks.html b/en/jdisc/pluggable-frameworks.html
index 4c5bc7e15a..aa182577fa 100644
--- a/en/jdisc/pluggable-frameworks.html
+++ b/en/jdisc/pluggable-frameworks.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Using Libraries for Pluggable Frameworks"
-redirect_from:
-- /documentation/jdisc/pluggable-frameworks.html
 ---
 
 <p>
diff --git a/en/jdisc/processing.html b/en/jdisc/processing.html
index 57f533ca2a..23f7cd6562 100644
--- a/en/jdisc/processing.html
+++ b/en/jdisc/processing.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Request-Response Processing"
-redirect_from:
-- /documentation/jdisc/processing.html
 ---
 
 <p>
diff --git a/en/jdisc/server-tutorial.html b/en/jdisc/server-tutorial.html
index aabcdd8584..19d248c1a7 100644
--- a/en/jdisc/server-tutorial.html
+++ b/en/jdisc/server-tutorial.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Server Tutorial"
 redirect_from:
-- /documentation/reference/server-tutorial.html
 - /en/reference/server-tutorial.html
 ---
 
diff --git a/en/lightgbm.md b/en/lightgbm.md
index e2c7437b30..99ec1e3dad 100644
--- a/en/lightgbm.md
+++ b/en/lightgbm.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking with LightGBM Models"
-redirect_from:
-- /documentation/lightgbm.html
 ---
 
 [LightGBM](https://github.com/microsoft/LightGBM) is a gradient boosting
diff --git a/en/linguistics.html b/en/linguistics.html
index 85b9116717..0946e88ead 100644
--- a/en/linguistics.html
+++ b/en/linguistics.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Linguistics in Vespa"
-redirect_from:
-- /documentation/linguistics.html
 ---
 
 <p>
diff --git a/en/llms-in-vespa.md b/en/llms-in-vespa.md
index 48b008dcf7..bd75ede6e5 100644
--- a/en/llms-in-vespa.md
+++ b/en/llms-in-vespa.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Large Language Models in Vespa"
-redirect_from:
-- /documentation/llms-in-vespa.html
 ---
 
 Large Language Models (LLMs) are AI systems that generate human-like text,
diff --git a/en/llms-local.md b/en/llms-local.md
index 55e93d34b1..c8aca36dba 100644
--- a/en/llms-local.md
+++ b/en/llms-local.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Running LLMs inside your Vespa application"
-redirect_from:
-- /documentation/llms-local.html
 ---
 
 Please refer to [Large Language Models in Vespa](llms-in-vespa.html) for an
diff --git a/en/llms-rag.md b/en/llms-rag.md
index 9709015018..f3c9e75671 100644
--- a/en/llms-rag.md
+++ b/en/llms-rag.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Retrieval-augmented generation (RAG) in Vespa"
-redirect_from:
-- /documentation/llms-rag.html
 ---
 
 Please refer to [Large Language Models in Vespa](llms-in-vespa.html) for an
diff --git a/en/lucene-linguistics.html b/en/lucene-linguistics.html
index 724f23ef10..e448ac4d5c 100644
--- a/en/lucene-linguistics.html
+++ b/en/lucene-linguistics.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Lucene Linguistics"
-redirect_from:
-- /documentation/lucene-linguistics.html
 ---
 
 <p>
diff --git a/en/multivalue-query-operators.html b/en/multivalue-query-operators.html
index 701cfb70b5..750f896c7e 100644
--- a/en/multivalue-query-operators.html
+++ b/en/multivalue-query-operators.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Multivalue Query Operators"
-redirect_from:
-- /documentation/multivalue-query-operators.html
 ---
 
 <p>
diff --git a/en/nativerank.html b/en/nativerank.html
index fa2924d937..2b99cc0771 100644
--- a/en/nativerank.html
+++ b/en/nativerank.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking With nativeRank"
-redirect_from:
-- /documentation/nativerank.html
 ---
 
 <p>
diff --git a/en/nearest-neighbor-search.md b/en/nearest-neighbor-search.md
index 21d7966a86..e7de875bc8 100644
--- a/en/nearest-neighbor-search.md
+++ b/en/nearest-neighbor-search.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Nearest Neighbor Search"
-redirect_from:
-- /documentation/nearest-neighbor-search.html
 ---
 
 Nearest neighbor search, or vector search, is a technique used
diff --git a/en/onnx.md b/en/onnx.md
index 846e14b4bb..28f6a727c1 100644
--- a/en/onnx.md
+++ b/en/onnx.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking With ONNX Models"
-redirect_from:
-- /documentation/onnx.html
 ---
 
 Vespa supports advanced ranking models through its tensor API. If your model is in the [ONNX format](https://onnx.ai/), Vespa can import and use the model directly. You can use ONNX models with Vespa [embedder](embedding.html) functionality or in [ranking](ranking.html).
diff --git a/en/operations-selfhosted/admin-procedures.html b/en/operations-selfhosted/admin-procedures.html
index 7bc71fc637..fc6d214f3b 100644
--- a/en/operations-selfhosted/admin-procedures.html
+++ b/en/operations-selfhosted/admin-procedures.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Administrative Procedures"
 redirect_from:
-- /documentation/operations/admin-procedures.html
 - /en/operations/admin-procedures.html
 ---
 
diff --git a/en/operations-selfhosted/config-proxy.html b/en/operations-selfhosted/config-proxy.html
index ed2e86c578..6f1d298f4b 100644
--- a/en/operations-selfhosted/config-proxy.html
+++ b/en/operations-selfhosted/config-proxy.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Configuration proxy"
 redirect_from:
-- /documentation/reference/config-proxy.html
 - /en/reference/config-proxy.html
 - /en/operations/config-proxy.html
 ---
diff --git a/en/operations-selfhosted/config-sentinel.html b/en/operations-selfhosted/config-sentinel.html
index 807afd3d15..2c3b014dae 100644
--- a/en/operations-selfhosted/config-sentinel.html
+++ b/en/operations-selfhosted/config-sentinel.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Config sentinel"
 redirect_from:
-- /documentation/config-sentinel.html
 - /en/config-sentinel.html
 - /en/operations/config-sentinel.html
 ---
diff --git a/en/operations-selfhosted/configuration-server.html b/en/operations-selfhosted/configuration-server.html
index 2675b3ee92..39ca4723f6 100644
--- a/en/operations-selfhosted/configuration-server.html
+++ b/en/operations-selfhosted/configuration-server.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Configuration Servers"
 redirect_from:
-- /documentation/cloudconfig/configuration-server.html
 - /en/cloudconfig/configuration-server.html
 - /en/operations/configuration-server.html
 ---
diff --git a/en/operations-selfhosted/container.html b/en/operations-selfhosted/container.html
index 9292a3f449..618757b298 100644
--- a/en/operations-selfhosted/container.html
+++ b/en/operations-selfhosted/container.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Container"
 redirect_from:
-- /documentation/inspecting-java-services.html
 - /en/inspecting-java-services.html
 - /en/operations/container.html
 ---
diff --git a/en/operations-selfhosted/docker-containers.html b/en/operations-selfhosted/docker-containers.html
index 97bbcd873c..9d693cedfc 100644
--- a/en/operations-selfhosted/docker-containers.html
+++ b/en/operations-selfhosted/docker-containers.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Docker containers"
 redirect_from:
-- /documentation/docker-containers-in-production.html
 - /en/docker-containers-in-production.html
 - /en/operations/docker-containers.html
 ---
diff --git a/en/operations-selfhosted/files-processes-and-ports.html b/en/operations-selfhosted/files-processes-and-ports.html
index f9972f3984..7e1af376ce 100644
--- a/en/operations-selfhosted/files-processes-and-ports.html
+++ b/en/operations-selfhosted/files-processes-and-ports.html
@@ -2,8 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Files, Processes, Ports, Environment"
 redirect_from:
-- /documentation/reference/files-processes-and-ports.html
-- /documentation/setting-vespa-variables.html
 - /en/setting-vespa-variables.html
 - /en/reference/files-processes-and-ports.html
 ---
diff --git a/en/operations-selfhosted/live-upgrade.html b/en/operations-selfhosted/live-upgrade.html
index 1861011290..29c7299156 100644
--- a/en/operations-selfhosted/live-upgrade.html
+++ b/en/operations-selfhosted/live-upgrade.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Live-upgrading Vespa"
 redirect_from:
-- /documentation/operations/live-upgrade.html
 - /en/operations/live-upgrade.html
 ---
 
diff --git a/en/operations-selfhosted/monitoring.html b/en/operations-selfhosted/monitoring.html
index 998331fbd4..e5097862ce 100644
--- a/en/operations-selfhosted/monitoring.html
+++ b/en/operations-selfhosted/monitoring.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Monitoring"
 redirect_from:
-- /documentation/monitoring.html
 - /en/monitoring.html
 - /en/monitoring-with-grafana-quick-start.html
 - /en/operations/monitoring.html
diff --git a/en/operations-selfhosted/mtls.md b/en/operations-selfhosted/mtls.md
index e8a3cf2550..33e4de541c 100644
--- a/en/operations-selfhosted/mtls.md
+++ b/en/operations-selfhosted/mtls.md
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Securing Vespa with mutually authenticated TLS (mTLS)"
 redirect_from:
-- /documentation/mtls.html
 - /en/mtls.html
 ---
 
diff --git a/en/operations-selfhosted/multinode-systems.html b/en/operations-selfhosted/multinode-systems.html
index e5933e12f6..ec634a6113 100644
--- a/en/operations-selfhosted/multinode-systems.html
+++ b/en/operations-selfhosted/multinode-systems.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Multinode systems"
 redirect_from:
-- /documentation/multinode-systems.html
 - /en/multinode-systems.html
 - /en/vespa-quick-start-multinode-aws.html
 - /en/vespa-quick-start-multinode-aws-ecs.html
diff --git a/en/operations-selfhosted/node-setup.html b/en/operations-selfhosted/node-setup.html
index 88d1ae177b..200b769092 100644
--- a/en/operations-selfhosted/node-setup.html
+++ b/en/operations-selfhosted/node-setup.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Node and network setup"
 redirect_from:
-- /documentation/node-setup.html
 - /en/node-setup.html
 - /en/operations/node-setup.html
 ---
diff --git a/en/operations-selfhosted/procedure-change-attribute-index.html b/en/operations-selfhosted/procedure-change-attribute-index.html
index 489e409fd8..169c36ab10 100644
--- a/en/operations-selfhosted/procedure-change-attribute-index.html
+++ b/en/operations-selfhosted/procedure-change-attribute-index.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Procedure: Change from attribute to index"
 redirect_from:
-- /documentation/operations/procedure-change-attribute-index.html
 - /en/operations/procedure-change-attribute-index.html
 ---
 
diff --git a/en/operations-selfhosted/routing.html b/en/operations-selfhosted/routing.html
index 9f153b36e9..ae4bc8de12 100644
--- a/en/operations-selfhosted/routing.html
+++ b/en/operations-selfhosted/routing.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Routing"
 redirect_from:
-- /documentation/routing.html
 - /en/routing.html
 - /en/reference/services-routing.html
 - /en/reference/routingpolicies.html
diff --git a/en/operations-selfhosted/securing-your-vespa-installation.md b/en/operations-selfhosted/securing-your-vespa-installation.md
index 1932976e54..e7ef448923 100644
--- a/en/operations-selfhosted/securing-your-vespa-installation.md
+++ b/en/operations-selfhosted/securing-your-vespa-installation.md
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Securing a Vespa Installation"
 redirect_from:
-- /documentation/securing-your-vespa-installation.html
 - /en/securing-your-vespa-installation.html
 ---
 {% include note.html content="This document is only relevant for **self-hosting Vespa** as Vespa Cloud does this for you." %}
diff --git a/en/operations-selfhosted/slobrok.html b/en/operations-selfhosted/slobrok.html
index 7b65b3125e..2b3247c2f7 100644
--- a/en/operations-selfhosted/slobrok.html
+++ b/en/operations-selfhosted/slobrok.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Service location broker - slobrok"
 redirect_from:
-- /documentation/slobrok.html
 - /en/slobrok.html
 ---
 
diff --git a/en/operations-selfhosted/using-kubernetes-with-vespa.html b/en/operations-selfhosted/using-kubernetes-with-vespa.html
index 69b36e190c..09f192ed8a 100644
--- a/en/operations-selfhosted/using-kubernetes-with-vespa.html
+++ b/en/operations-selfhosted/using-kubernetes-with-vespa.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Using Kubernetes with Vespa"
 redirect_from:
-- /documentation/vespa-quick-start-kubernetes.html
 - /en/vespa-quick-start-kubernetes.html
 - /en/operations/using-kubernetes-with-vespa.html
 ---
diff --git a/en/operations-selfhosted/vespa-cmdline-tools.html b/en/operations-selfhosted/vespa-cmdline-tools.html
index 469bee9f1c..f7990b17c0 100644
--- a/en/operations-selfhosted/vespa-cmdline-tools.html
+++ b/en/operations-selfhosted/vespa-cmdline-tools.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Command-line Tools"
 redirect_from:
-- /documentation/reference/vespa-cmdline-tools.html
 - /en/reference/vespa-cmdline-tools.html
 ---
 
diff --git a/en/operations/batch-delete.html b/en/operations/batch-delete.html
index e184c06157..9a787b6468 100644
--- a/en/operations/batch-delete.html
+++ b/en/operations/batch-delete.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Batch delete"
-redirect_from:
-- /documentation/operations/batch-delete.html
 ---
 
 <p>
diff --git a/en/operations/feed-block.html b/en/operations/feed-block.html
index c52482a011..17cf495597 100644
--- a/en/operations/feed-block.html
+++ b/en/operations/feed-block.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Feed block"
-redirect_from:
-- /documentation/operations/feed-block.html
 ---
 
 <p>
diff --git a/en/operations/metrics.html b/en/operations/metrics.html
index 7c9b888960..94f599f0b4 100644
--- a/en/operations/metrics.html
+++ b/en/operations/metrics.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Metrics"
 redirect_from:
-- /documentation/reference/metrics.html
 - /en/reference/metrics.html
 ---
 
diff --git a/en/operations/reindexing.html b/en/operations/reindexing.html
index 2d1a18fb22..d186c2adaa 100644
--- a/en/operations/reindexing.html
+++ b/en/operations/reindexing.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Reindexing"
 redirect_from:
-- /documentation/reindexing.html
 - /en/reindexing.html
 ---
 
diff --git a/en/overview.html b/en/overview.html
index e7f55a4974..1021e4540e 100644
--- a/en/overview.html
+++ b/en/overview.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Overview"
-redirect_from:
-- /documentation/overview.html
 ---
 
 <p>Vespa is a platform for applications which need low-latency computation over large data sets.
diff --git a/en/page-templates.html b/en/page-templates.html
index 5361721971..7958187e30 100644
--- a/en/page-templates.html
+++ b/en/page-templates.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Page Templates"
-redirect_from:
-- /documentation/page-templates.html
 ---
 
 <p>
diff --git a/en/parent-child.html b/en/parent-child.html
index 49cc207ea5..e7ec905f80 100644
--- a/en/parent-child.html
+++ b/en/parent-child.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Parent/Child"
-redirect_from:
-- /documentation/parent-child.html
 ---
 
 <p>
diff --git a/en/partial-updates.html b/en/partial-updates.html
index aec08916b5..9d3e438093 100644
--- a/en/partial-updates.html
+++ b/en/partial-updates.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Partial Updates"
-redirect_from:
-- /documentation/partial-updates.html
 ---
 
 <p>
diff --git a/en/performance/caches-in-vespa.html b/en/performance/caches-in-vespa.html
index 817d3756c6..55c5efe4af 100644
--- a/en/performance/caches-in-vespa.html
+++ b/en/performance/caches-in-vespa.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Caches"
-redirect_from:
-- /documentation/performance/caches-in-vespa.html
 ---
 
 
diff --git a/en/performance/container-http.html b/en/performance/container-http.html
index 80b9e28852..152a8e3125 100644
--- a/en/performance/container-http.html
+++ b/en/performance/container-http.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "HTTP Performance Testing of the Container using Gatling"
-redirect_from:
-- /documentation/performance/container-http.html
 ---
 
 <p> For container testing, more flexibility and more detailed
diff --git a/en/performance/container-tuning.html b/en/performance/container-tuning.html
index f79376de01..1f22f8e931 100644
--- a/en/performance/container-tuning.html
+++ b/en/performance/container-tuning.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Container Tuning"
-redirect_from:
-- /documentation/performance/container-tuning.html
 ---
 
 <p>
diff --git a/en/performance/feature-tuning.html b/en/performance/feature-tuning.html
index 0a488348c2..4737885e69 100644
--- a/en/performance/feature-tuning.html
+++ b/en/performance/feature-tuning.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Serving Tuning"
-redirect_from:
-- /documentation/performance/feature-tuning.html
 ---
 
 <p>
diff --git a/en/performance/http2.html b/en/performance/http2.html
index 76840c6b6d..0fff3f4fc0 100644
--- a/en/performance/http2.html
+++ b/en/performance/http2.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "HTTP/2"
-redirect_from:
-- /documentation/performance/http2.html
 ---
 
 <p>
diff --git a/en/performance/index.html b/en/performance/index.html
index 5bb4038088..a1badc5369 100644
--- a/en/performance/index.html
+++ b/en/performance/index.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Performance"
-redirect_from:
-- /documentation/performance/index.html
 ---
 
 <h2 id="practical-search-performance-guide">Practical search performance guide</h2>
diff --git a/en/performance/profiling.html b/en/performance/profiling.html
index 30e4eb6195..a9e99748ff 100644
--- a/en/performance/profiling.html
+++ b/en/performance/profiling.html
@@ -2,8 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Profiling"
 redirect_from:
-- /documentation/performance/profiling.html
-- /documentation/performance/profiling-search-container.html
 - /en/performance/profiling-search-container.html
 ---
 
diff --git a/en/performance/rate-limiting-searcher.html b/en/performance/rate-limiting-searcher.html
index c77a0135b3..d652fc368e 100644
--- a/en/performance/rate-limiting-searcher.html
+++ b/en/performance/rate-limiting-searcher.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Rate Limiting Search Requests"
-redirect_from:
-- /documentation/performance/rate-limiting-searcher.html
 ---
 
 <p>
diff --git a/en/performance/sizing-examples.html b/en/performance/sizing-examples.html
index 5cc3e86e74..a9d9c49e1c 100644
--- a/en/performance/sizing-examples.html
+++ b/en/performance/sizing-examples.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Scaling Configuration Examples"
-redirect_from:
-- /documentation/performance/sizing-examples.html
 ---
 
 <p>
diff --git a/en/performance/sizing-feeding.html b/en/performance/sizing-feeding.html
index 87955e0cc5..3d4247f2e9 100644
--- a/en/performance/sizing-feeding.html
+++ b/en/performance/sizing-feeding.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Feed Sizing Guide"
-redirect_from:
-- /documentation/performance/sizing-feeding.html
 ---
 
 <p>
diff --git a/en/performance/sizing-search.html b/en/performance/sizing-search.html
index 14f4a86587..e3f88ef433 100644
--- a/en/performance/sizing-search.html
+++ b/en/performance/sizing-search.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Serving Scaling Guide"
-redirect_from:
-- /documentation/performance/sizing-search.html
 ---
 
 <p><em>Vespa can scale in multiple scaling dimensions:</em></p>
diff --git a/en/performance/valgrind.html b/en/performance/valgrind.html
index b9477de0b0..1213bed3bc 100644
--- a/en/performance/valgrind.html
+++ b/en/performance/valgrind.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Using Valgrind with Vespa"
-redirect_from:
-- /documentation/performance/valgrind.html
 ---
 
 <p>
diff --git a/en/performance/vespa-benchmarking.html b/en/performance/vespa-benchmarking.html
index 740ba99f35..0dbb25b434 100644
--- a/en/performance/vespa-benchmarking.html
+++ b/en/performance/vespa-benchmarking.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Benchmarking"
-redirect_from:
-- /documentation/performance/vespa-benchmarking.html
 ---
 
 <p>
@@ -235,4 +233,4 @@ <h3 id="metrics">Metrics</h3>
 <pre>
 $ curl http://localhost:8080/metrics/v2/values | \
   jq '.nodes[] | select(.role=="content/mysearchcluster/0/0") | .node.metrics[].values."cpu.util"'
-</pre>
\ No newline at end of file
+</pre>
diff --git a/en/phased-ranking.html b/en/phased-ranking.html
index 90aa1f4cce..04abf0e9de 100644
--- a/en/phased-ranking.html
+++ b/en/phased-ranking.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Phased Ranking"
-redirect_from:
-- /documentation/phased-ranking.html
 ---
 
 <p>
diff --git a/en/predicate-fields.html b/en/predicate-fields.html
index d9a835d534..2000aacb6d 100644
--- a/en/predicate-fields.html
+++ b/en/predicate-fields.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Predicate Fields"
-redirect_from:
-- /documentation/predicate-fields.html
 ---
 
 <p>
diff --git a/en/proton.html b/en/proton.html
index efb0cb905b..0994790066 100644
--- a/en/proton.html
+++ b/en/proton.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Proton"
 redirect_from:
-- /documentation/proton.html
 - /en/reference/search-custom-state-api.html
 ---
 
diff --git a/en/query-api.html b/en/query-api.html
index 69e769f835..352da3eb52 100644
--- a/en/query-api.html
+++ b/en/query-api.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Query API"
-redirect_from:
-- /documentation/query-api.html
 ---
 
 <p>
diff --git a/en/query-language.html b/en/query-language.html
index 9db8a0abdb..2dcf183d90 100644
--- a/en/query-language.html
+++ b/en/query-language.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa Query Language - YQL"
-redirect_from:
-- /documentation/query-language.html
 ---
 
 <p>
diff --git a/en/query-profiles.html b/en/query-profiles.html
index fb7ee181a9..8de4b3c542 100644
--- a/en/query-profiles.html
+++ b/en/query-profiles.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Query Profiles"
-redirect_from:
-- /documentation/query-profiles.html
 ---
 
 <p>
diff --git a/en/query-rewriting.html b/en/query-rewriting.html
index 3737bf29e4..537915c7cb 100644
--- a/en/query-rewriting.html
+++ b/en/query-rewriting.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Query Rewriting"
-redirect_from:
-- /documentation/query-rewriting.html
 ---
 
 <p>
diff --git a/en/ranking-expressions-features.html b/en/ranking-expressions-features.html
index c6d18c0495..2cd7154422 100644
--- a/en/ranking-expressions-features.html
+++ b/en/ranking-expressions-features.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking Expressions and Features"
-redirect_from:
-- /documentation/ranking-expressions-features.html
 ---
 
 <p>
diff --git a/en/ranking.html b/en/ranking.html
index fa27e399d2..15b6f04be0 100644
--- a/en/ranking.html
+++ b/en/ranking.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking"
-redirect_from:
-- /documentation/ranking.html
 ---
 <p>
   Vespa ranks documents retrieved by a query by performing computations or inference that produces a score for each document. 
diff --git a/en/reads-and-writes.html b/en/reads-and-writes.html
index 5f37289ffe..4e32c4a450 100644
--- a/en/reads-and-writes.html
+++ b/en/reads-and-writes.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Reads and writes"
-redirect_from:
-- /documentation/reads-and-writes.html
 ---
 
 <p>
diff --git a/en/reference/application-packages-reference.html b/en/reference/application-packages-reference.html
index 51488f955a..9c9fa2d51a 100644
--- a/en/reference/application-packages-reference.html
+++ b/en/reference/application-packages-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Application Package Reference"
-redirect_from:
-- /documentation/reference/application-packages-reference.html
 ---
 
 <p>
diff --git a/en/reference/application-v2-tenant.html b/en/reference/application-v2-tenant.html
index f4a5377d6e..801aa07de6 100644
--- a/en/reference/application-v2-tenant.html
+++ b/en/reference/application-v2-tenant.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "/application/v2/tenant API reference"
 redirect_from:
-- /documentation/cloudconfig/tenant-rest-api.html
 - /en/cloudconfig/tenant-rest-api.html
 - /en/reference/tenant-rest-api.html
 ---
diff --git a/en/reference/bm25.html b/en/reference/bm25.html
index 53b01abb28..7bfd30d82a 100644
--- a/en/reference/bm25.html
+++ b/en/reference/bm25.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "BM25 Reference"
-redirect_from:
-- /documentation/reference/bm25.html
 ---
 
 <p>
diff --git a/en/reference/cluster-v2.html b/en/reference/cluster-v2.html
index 18ceff2ee0..904d14c04f 100644
--- a/en/reference/cluster-v2.html
+++ b/en/reference/cluster-v2.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "/cluster/v2 API reference"
 redirect_from:
-- /documentation/content/api-state-rest-api.html
 - /en/content/api-state-rest-api.html
 ---
 
diff --git a/en/reference/component-reference.html b/en/reference/component-reference.html
index 7510503255..ec186f381e 100644
--- a/en/reference/component-reference.html
+++ b/en/reference/component-reference.html
@@ -2,8 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Component Reference"
 redirect_from:
-- /documentation/reference/component-reference.html
-- /documentation/jdisc/component-versioning.html
 - /en/jdisc/component-versioning.html
 ---
 
diff --git a/en/reference/config-files.html b/en/reference/config-files.html
index 6a97ded7c0..f88950a95e 100644
--- a/en/reference/config-files.html
+++ b/en/reference/config-files.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Custom Configuration File Reference"
-redirect_from:
-- /documentation/reference/config-files.html
 ---
 
 <p>
diff --git a/en/reference/config-rest-api-v2.html b/en/reference/config-rest-api-v2.html
index 0fcd087199..061b820074 100644
--- a/en/reference/config-rest-api-v2.html
+++ b/en/reference/config-rest-api-v2.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Config API"
 redirect_from:
-- /documentation/cloudconfig/config-rest-api-v2.html
 - /en/cloudconfig/config-rest-api-v2.html
 ---
 
diff --git a/en/reference/constant-tensor-json-format.html b/en/reference/constant-tensor-json-format.html
index 90b337f461..278a3e7112 100644
--- a/en/reference/constant-tensor-json-format.html
+++ b/en/reference/constant-tensor-json-format.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Constant Tensor JSON Format"
-redirect_from:
-- /documentation/reference/constant-tensor-json-format.html
 ---
 
 <p>
diff --git a/en/reference/default-result-format.html b/en/reference/default-result-format.html
index 45cf0a367a..ae384adbcd 100644
--- a/en/reference/default-result-format.html
+++ b/en/reference/default-result-format.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Default JSON Result Format"
-redirect_from:
-- /documentation/reference/default-result-format.html
 ---
 
 <p>
diff --git a/en/reference/deploy-rest-api-v2.html b/en/reference/deploy-rest-api-v2.html
index e22ef246dd..7b0bd13e1b 100644
--- a/en/reference/deploy-rest-api-v2.html
+++ b/en/reference/deploy-rest-api-v2.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Deploy API"
 redirect_from:
-- /documentation/cloudconfig/deploy-rest-api-v2.html
 - /en/cloudconfig/deploy-rest-api-v2.html
 ---
 
diff --git a/en/reference/developing-server-providers.html b/en/reference/developing-server-providers.html
index 370876fce2..67cda5a5c6 100644
--- a/en/reference/developing-server-providers.html
+++ b/en/reference/developing-server-providers.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Developing server providers"
-redirect_from:
-- /documentation/reference/developing-server-providers.html
 ---
 
 <p>
diff --git a/en/reference/document-field-path.html b/en/reference/document-field-path.html
index f06d8a2143..296098978e 100644
--- a/en/reference/document-field-path.html
+++ b/en/reference/document-field-path.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Document Field Path Syntax"
-redirect_from:
-- /documentation/reference/document-field-path.html
 ---
 
 <p>
diff --git a/en/reference/document-json-format.html b/en/reference/document-json-format.html
index 0e862340e7..364a53d944 100644
--- a/en/reference/document-json-format.html
+++ b/en/reference/document-json-format.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Document JSON Format"
-redirect_from:
-- /documentation/reference/document-json-format.html
 ---
 
 <p>
diff --git a/en/reference/document-select-language.html b/en/reference/document-select-language.html
index 19288cec07..1c17dce9f6 100644
--- a/en/reference/document-select-language.html
+++ b/en/reference/document-select-language.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Document Selector Language"
-redirect_from:
-- /documentation/reference/document-select-language.html
 ---
 
 <p>
diff --git a/en/reference/document-v1-api-reference.html b/en/reference/document-v1-api-reference.html
index e8103d7bee..591cf814fb 100644
--- a/en/reference/document-v1-api-reference.html
+++ b/en/reference/document-v1-api-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "/document/v1 API reference"
-redirect_from:
-- /documentation/reference/document-v1-api-reference.html
 ---
 
 <p>
diff --git a/en/reference/embedding-reference.html b/en/reference/embedding-reference.html
index 36c7399cfc..97610aeb2e 100644
--- a/en/reference/embedding-reference.html
+++ b/en/reference/embedding-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Embedding Reference"
-redirect_from:
-- /documentation/reference/embedding-reference.html
 ---
 
 <p>Reference configuration for <a href="../embedding.html">embedders</a>.</p>
diff --git a/en/reference/grouping-syntax.html b/en/reference/grouping-syntax.html
index 16428b6d41..0bce353b72 100644
--- a/en/reference/grouping-syntax.html
+++ b/en/reference/grouping-syntax.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Grouping Reference"
-redirect_from:
-- /documentation/reference/grouping-syntax.html
 ---
 
 
diff --git a/en/reference/healthchecks.html b/en/reference/healthchecks.html
index c053d1337b..beec5d7f68 100644
--- a/en/reference/healthchecks.html
+++ b/en/reference/healthchecks.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Healthchecks"
-redirect_from:
-- /documentation/reference/healthchecks.html
 ---
 
 <p>
diff --git a/en/reference/hosts.html b/en/reference/hosts.html
index e59fdf61b9..4c1839aeb7 100644
--- a/en/reference/hosts.html
+++ b/en/reference/hosts.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "hosts.xml"
-redirect_from:
-- /documentation/reference/hosts.html
 ---
 
 <p>
diff --git a/en/reference/indexing-language-reference.html b/en/reference/indexing-language-reference.html
index 72dd176740..4d6a2fec9c 100644
--- a/en/reference/indexing-language-reference.html
+++ b/en/reference/indexing-language-reference.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Indexing Language Reference"
 redirect_from:
-- /documentation/reference/advanced-indexing-language.html
 - /en/reference/advanced-indexing-language.html
 ---
 
diff --git a/en/reference/inspecting-structured-data.html b/en/reference/inspecting-structured-data.html
index d13f022309..c49fc76df1 100644
--- a/en/reference/inspecting-structured-data.html
+++ b/en/reference/inspecting-structured-data.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Inspecting structured data in a Searcher"
-redirect_from:
-- /documentation/reference/inspecting-structured-data.html
 ---
 
 <p>
diff --git a/en/reference/internal-config-files.html b/en/reference/internal-config-files.html
index c0340968aa..cec581e150 100644
--- a/en/reference/internal-config-files.html
+++ b/en/reference/internal-config-files.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Internal Configuration File Reference"
-redirect_from:
-- /documentation/reference/internal-config-files.html
 ---
 
 <p>
diff --git a/en/reference/logs.html b/en/reference/logs.html
index 45c345cf18..d733872fab 100644
--- a/en/reference/logs.html
+++ b/en/reference/logs.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Log Files"
-redirect_from:
-- /documentation/reference/logs.html
 ---
 
 <p>
diff --git a/en/reference/low-level-request-handlers.html b/en/reference/low-level-request-handlers.html
index 94c4bd19c3..2e5c64b143 100644
--- a/en/reference/low-level-request-handlers.html
+++ b/en/reference/low-level-request-handlers.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Low-level request handler APIs"
-redirect_from:
-- /documentation/reference/low-level-request-handlers.html
 ---
 
 <p>
diff --git a/en/reference/mtls.md b/en/reference/mtls.md
index 0e8130bf0c..081da05def 100644
--- a/en/reference/mtls.md
+++ b/en/reference/mtls.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Mutually authenticated TLS (mTLS) reference"
-redirect_from:
-- /documentation/reference/mtls.html
 ---
 
 {% include note.html content="See [Securing a self-hosted Vespa application with mutually authenticated TLS (mTLS)](/en/operations-selfhosted/mtls.html) 
diff --git a/en/reference/nativerank.html b/en/reference/nativerank.html
index 32d03eaf25..9d7578628f 100644
--- a/en/reference/nativerank.html
+++ b/en/reference/nativerank.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "nativeRank Reference"
-redirect_from:
-- /documentation/reference/nativerank.html
 ---
 
 <p>
diff --git a/en/reference/page-result-format.html b/en/reference/page-result-format.html
index bb791f1a6a..fa1a4a1739 100644
--- a/en/reference/page-result-format.html
+++ b/en/reference/page-result-format.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "The Vespa Search API - Page result format"
-redirect_from:
-- /documentation/reference/page-result-format.html
 ---
 
 
diff --git a/en/reference/page-templates-syntax.html b/en/reference/page-templates-syntax.html
index dfe52569bd..8e891bc492 100644
--- a/en/reference/page-templates-syntax.html
+++ b/en/reference/page-templates-syntax.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Page Templates Syntax"
-redirect_from:
-- /documentation/reference/page-templates-syntax.html
 ---
 
 <p>
diff --git a/en/reference/query-api-reference.html b/en/reference/query-api-reference.html
index 5f4d762306..49aba3bf09 100644
--- a/en/reference/query-api-reference.html
+++ b/en/reference/query-api-reference.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Query API Reference"
 redirect_from:
-- /documentation/reference/query-api-reference.html
 - /en/reference/search-api-reference.html
 ---
 
diff --git a/en/reference/query-language-reference.html b/en/reference/query-language-reference.html
index c229e3f433..18e39922e3 100644
--- a/en/reference/query-language-reference.html
+++ b/en/reference/query-language-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "YQL Query Language Reference"
-redirect_from:
-- /documentation/reference/query-language-reference.html
 ---
 
 <p>
diff --git a/en/reference/query-profile-reference.html b/en/reference/query-profile-reference.html
index d99bfa531d..d790aed494 100644
--- a/en/reference/query-profile-reference.html
+++ b/en/reference/query-profile-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Query Profile Reference"
-redirect_from:
-- /documentation/reference/query-profile-reference.html
 ---
 
 <p>
diff --git a/en/reference/rank-feature-configuration.html b/en/reference/rank-feature-configuration.html
index 5065da140b..c2cb1e3d6c 100644
--- a/en/reference/rank-feature-configuration.html
+++ b/en/reference/rank-feature-configuration.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Rank Feature Configuration"
-redirect_from:
-- /documentation/reference/rank-feature-configuration.html
 ---
 
 <p>
diff --git a/en/reference/rank-features.html b/en/reference/rank-features.html
index 5e94c988c7..264a3b112f 100644
--- a/en/reference/rank-features.html
+++ b/en/reference/rank-features.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Rank Feature Reference"
-redirect_from:
-- /documentation/reference/rank-features.html
 ---
 
 <p>
diff --git a/en/reference/rank-types.html b/en/reference/rank-types.html
index c266e6eea2..5f05e1e388 100644
--- a/en/reference/rank-types.html
+++ b/en/reference/rank-types.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Rank Types"
-redirect_from:
-- /documentation/reference/rank-types.html
 ---
 
 <p>
diff --git a/en/reference/ranking-expressions.html b/en/reference/ranking-expressions.html
index 78b0ea926c..2991ca0039 100644
--- a/en/reference/ranking-expressions.html
+++ b/en/reference/ranking-expressions.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking Expressions"
-redirect_from:
-- /documentation/reference/ranking-expressions.html
 ---
 
 <p>
diff --git a/en/reference/schema-reference.html b/en/reference/schema-reference.html
index 323ae5e919..aa9a25d8e0 100644
--- a/en/reference/schema-reference.html
+++ b/en/reference/schema-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Schema Reference"
-redirect_from:
-- /documentation/reference/schema-reference.html
 ---
 
 <p>
diff --git a/en/reference/select-reference.md b/en/reference/select-reference.md
index c07cc5660e..61ccaad5b5 100644
--- a/en/reference/select-reference.md
+++ b/en/reference/select-reference.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Select Reference"
-redirect_from:
-- /documentation/reference/select-reference.html
 ---
 
 
diff --git a/en/reference/semantic-rules.html b/en/reference/semantic-rules.html
index 7290d328b6..24efa00088 100644
--- a/en/reference/semantic-rules.html
+++ b/en/reference/semantic-rules.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Semantic Rule Language Reference"
-redirect_from:
-- /documentation/reference/semantic-rules.html
 ---
 
 <p>
diff --git a/en/reference/services-admin.html b/en/reference/services-admin.html
index 69e1f737f1..8a7ee7a1ba 100644
--- a/en/reference/services-admin.html
+++ b/en/reference/services-admin.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - 'admin'"
-redirect_from:
-- /documentation/reference/services-admin.html
 ---
 
 <!-- ToDo: most of this is for self-hosted only, except maybe metrics stuff -->
diff --git a/en/reference/services-container.html b/en/reference/services-container.html
index 0ff1a96338..d369fb8a18 100644
--- a/en/reference/services-container.html
+++ b/en/reference/services-container.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - container"
-redirect_from:
-- /documentation/reference/services-container.html
 ---
 
 <p>
diff --git a/en/reference/services-content.html b/en/reference/services-content.html
index 874447da68..c4b6c27877 100644
--- a/en/reference/services-content.html
+++ b/en/reference/services-content.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - 'content'"
-redirect_from:
-- /documentation/reference/services-content.html
 ---
 
 <pre class="pre-config">
diff --git a/en/reference/services-docproc.html b/en/reference/services-docproc.html
index 42341aa8a7..3e67cdc3bc 100644
--- a/en/reference/services-docproc.html
+++ b/en/reference/services-docproc.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - document-processing"
-redirect_from:
-- /documentation/reference/services-docproc.html
 ---
 
 <p>
diff --git a/en/reference/services-http.html b/en/reference/services-http.html
index 2496e67c92..e99848b6b1 100644
--- a/en/reference/services-http.html
+++ b/en/reference/services-http.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - http"
-redirect_from:
-- /documentation/reference/services-http.html
 ---
 
 <p>
diff --git a/en/reference/services-processing.html b/en/reference/services-processing.html
index d4e1937844..0947f318a3 100644
--- a/en/reference/services-processing.html
+++ b/en/reference/services-processing.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - processing"
-redirect_from:
-- /documentation/reference/services-processing.html
 ---
 
 <p>
diff --git a/en/reference/services-search.html b/en/reference/services-search.html
index b187493bd3..a188fdd58e 100644
--- a/en/reference/services-search.html
+++ b/en/reference/services-search.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml - 'search'"
-redirect_from:
-- /documentation/reference/services-search.html
 ---
 
 <p>
diff --git a/en/reference/services.html b/en/reference/services.html
index 683961a520..916b2a5e86 100644
--- a/en/reference/services.html
+++ b/en/reference/services.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "services.xml"
-redirect_from:
-- /documentation/reference/services.html
 ---
 
 <p>
diff --git a/en/reference/simple-query-language-reference.html b/en/reference/simple-query-language-reference.html
index 361cc2b850..82de0420f9 100644
--- a/en/reference/simple-query-language-reference.html
+++ b/en/reference/simple-query-language-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Simple Query Language Reference"
-redirect_from:
-- /documentation/reference/simple-query-language-reference.html
 ---
 
 <p>
diff --git a/en/reference/sorting.html b/en/reference/sorting.html
index 4ef415331e..f9a2535643 100644
--- a/en/reference/sorting.html
+++ b/en/reference/sorting.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Sorting Reference"
-redirect_from:
-- /documentation/reference/sorting.html
 ---
 
 <p>
diff --git a/en/reference/stateless-model-reference.html b/en/reference/stateless-model-reference.html
index 9e614692d6..e548842abe 100644
--- a/en/reference/stateless-model-reference.html
+++ b/en/reference/stateless-model-reference.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Stateless model reference"
-redirect_from:
-- /documentation/reference/stateless-model-reference.html
 ---
 <p>
 <em>.model</em> files are used in
diff --git a/en/reference/string-segment-match.html b/en/reference/string-segment-match.html
index 1fb9817d11..758b76cf67 100644
--- a/en/reference/string-segment-match.html
+++ b/en/reference/string-segment-match.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "String Segment Match"
-redirect_from:
-- /documentation/reference/string-segment-match.html
 ---
 
 <p>
diff --git a/en/reference/tensor.html b/en/reference/tensor.html
index e32fbb93a2..1b50eedfe9 100644
--- a/en/reference/tensor.html
+++ b/en/reference/tensor.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Tensor Reference"
-redirect_from:
-- /documentation/reference/tensor.html
 ---
 
 <p>
diff --git a/en/reference/validation-overrides.html b/en/reference/validation-overrides.html
index 243e51ee09..6d0d7c4563 100644
--- a/en/reference/validation-overrides.html
+++ b/en/reference/validation-overrides.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: validation-overrides.xml
-redirect_from:
-- /documentation/reference/validation-overrides.html
 ---
 
 <p>
diff --git a/en/result-rendering.html b/en/result-rendering.html
index 4c2c31a5da..1c51275bfb 100644
--- a/en/result-rendering.html
+++ b/en/result-rendering.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Result Renderers"
-redirect_from:
-- /documentation/result-rendering.html
 ---
 
 <p>
diff --git a/en/schemas.html b/en/schemas.html
index 01fd482751..a0e53f63d8 100644
--- a/en/schemas.html
+++ b/en/schemas.html
@@ -2,8 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Schemas"
 redirect_from:
-- /documentation/schemas.html
-- /documentation/schema-inheritance.html
 - /en/schema-inheritance.html
 ---
 
diff --git a/en/searcher-development.html b/en/searcher-development.html
index 85b26b26bb..d7810e8b8f 100644
--- a/en/searcher-development.html
+++ b/en/searcher-development.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Searcher Development"
-redirect_from:
-- /documentation/searcher-development.html
 ---
 
 <p>
diff --git a/en/stateless-model-evaluation.html b/en/stateless-model-evaluation.html
index 8afbef132e..31b8185503 100644
--- a/en/stateless-model-evaluation.html
+++ b/en/stateless-model-evaluation.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Stateless Model Evaluation"
-redirect_from:
-- /documentation/stateless-model-evaluation.html
 ---
 
 <p>
diff --git a/en/streaming-search.html b/en/streaming-search.html
index 2ff7e13ada..58b6d369a0 100644
--- a/en/streaming-search.html
+++ b/en/streaming-search.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Streaming Search"
-redirect_from:
-- /documentation/streaming-search.html
 ---
 
 <p>Search engines make queries fast by creating indexes over the stored data.
diff --git a/en/tensor-examples.html b/en/tensor-examples.html
index ed8fa4ccb1..eb57081b31 100644
--- a/en/tensor-examples.html
+++ b/en/tensor-examples.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Tensor Computation Examples"
-redirect_from:
-- /documentation/tensor-examples.html
 ---
 
 <p>Tensors can be used to express machine-learned models such as neural nets,
diff --git a/en/tensor-user-guide.html b/en/tensor-user-guide.html
index 0f539aca60..e07bff812f 100644
--- a/en/tensor-user-guide.html
+++ b/en/tensor-user-guide.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Tensor Guide"
-redirect_from:
-- /documentation/tensor-user-guide.html
 ---
 
 <p>
diff --git a/en/tensorflow.md b/en/tensorflow.md
index 6e757f52d7..629ac67e86 100644
--- a/en/tensorflow.md
+++ b/en/tensorflow.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking with TensorFlow Models"
-redirect_from:
-- /documentation/tensorflow.html
 ---
 
 Vespa can import TensorFlow models converted to the ONNX format. The tutorial 
diff --git a/en/text-matching.html b/en/text-matching.html
index e37ffc1692..9cf954e5c3 100644
--- a/en/text-matching.html
+++ b/en/text-matching.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Text Matching"
 redirect_from:
-- /documentation/text-matching-ranking.html
 - /en/text-matching-ranking.html
 ---
 
diff --git a/en/troubleshooting-encoding.html b/en/troubleshooting-encoding.html
index 2aa33c1357..335729f80f 100644
--- a/en/troubleshooting-encoding.html
+++ b/en/troubleshooting-encoding.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Troubleshooting character encoding"
-redirect_from:
-- /documentation/troubleshooting-encoding.html
 ---
 
 <p>
diff --git a/en/tutorials/hybrid-search.md b/en/tutorials/hybrid-search.md
index cd74747212..c8cc9220c1 100644
--- a/en/tutorials/hybrid-search.md
+++ b/en/tutorials/hybrid-search.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Hybrid Text Search Tutorial"
-redirect_from:
-- /documentation/tutorials/hybrid-search.html
 ---
 
 
diff --git a/en/tutorials/index.md b/en/tutorials/index.md
index 881b483989..1364edbf96 100644
--- a/en/tutorials/index.md
+++ b/en/tutorials/index.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Tutorials"
-redirect_from:
-- /documentation/tutorials/index.html
 ---
 
 ## News Search and recommendation
diff --git a/en/tutorials/models-hot-swap.md b/en/tutorials/models-hot-swap.md
index d49f2f1066..a610aff8b8 100644
--- a/en/tutorials/models-hot-swap.md
+++ b/en/tutorials/models-hot-swap.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Models hot swap tutorial"
-redirect_from:
-- /documentation/tutorials/models-hot-swap.html
 ---
 
 This tutorial builds on the [news recommendation tutorial](news-1-getting-started.html).
diff --git a/en/tutorials/news-1-getting-started.md b/en/tutorials/news-1-getting-started.md
index 9db7260499..180a7253f2 100644
--- a/en/tutorials/news-1-getting-started.md
+++ b/en/tutorials/news-1-getting-started.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News search and recommendation tutorial - getting started on Docker"
-redirect_from:
-- /documentation/tutorials/news-1-getting-started.html
 ---
 
 
diff --git a/en/tutorials/news-2-basic-feeding-and-query.md b/en/tutorials/news-2-basic-feeding-and-query.md
index 0cf4ee3614..ab25e5ecbe 100644
--- a/en/tutorials/news-2-basic-feeding-and-query.md
+++ b/en/tutorials/news-2-basic-feeding-and-query.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News search and recommendation tutorial - applications, feeding and querying"
-redirect_from:
-- /documentation/tutorials/news-2-basic-feeding-and-query.html
 ---
 
 
diff --git a/en/tutorials/news-3-searching.md b/en/tutorials/news-3-searching.md
index f965018947..7fd8dedf80 100644
--- a/en/tutorials/news-3-searching.md
+++ b/en/tutorials/news-3-searching.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News search and recommendation tutorial - searching"
-redirect_from:
-- /documentation/tutorials/news-3-searching.html
 ---
 
 
diff --git a/en/tutorials/news-4-embeddings.md b/en/tutorials/news-4-embeddings.md
index b7b2acdae5..de98eb3c94 100644
--- a/en/tutorials/news-4-embeddings.md
+++ b/en/tutorials/news-4-embeddings.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News search and recommendation tutorial - embeddings"
-redirect_from:
-- /documentation/tutorials/news-4-embeddings.html
 ---
 
 
diff --git a/en/tutorials/news-5-recommendation.md b/en/tutorials/news-5-recommendation.md
index 22be2fa840..a64eef2f3a 100644
--- a/en/tutorials/news-5-recommendation.md
+++ b/en/tutorials/news-5-recommendation.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News search and recommendation tutorial - recommendations"
-redirect_from:
-- /documentation/tutorials/news-5-recommendation.html
 ---
 
 This is the fifth part of the tutorial series for setting up a Vespa
diff --git a/en/tutorials/news-6-recommendation-with-searchers.md b/en/tutorials/news-6-recommendation-with-searchers.md
index d737148417..2f4ce45a63 100644
--- a/en/tutorials/news-6-recommendation-with-searchers.md
+++ b/en/tutorials/news-6-recommendation-with-searchers.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News search and recommendation tutorial - Searchers"
-redirect_from:
-- /documentation/tutorials/news-6-recommendation-with-searchers.html
 ---
 
 This is the sixth part of the tutorial series for setting up a Vespa
diff --git a/en/tutorials/news-7-recommendation-with-parent-child.md b/en/tutorials/news-7-recommendation-with-parent-child.md
index 704477a4c2..628d68f7c2 100644
--- a/en/tutorials/news-7-recommendation-with-parent-child.md
+++ b/en/tutorials/news-7-recommendation-with-parent-child.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "News Recommendation Tutorial - parent child and tensor ranking"
-redirect_from:
-- /documentation/tutorials/news-7-recommendation-with-parent-child.html
 ---
 
 
diff --git a/en/tutorials/text-search-ml.md b/en/tutorials/text-search-ml.md
index aca8cb5b67..26e39ab7fd 100644
--- a/en/tutorials/text-search-ml.md
+++ b/en/tutorials/text-search-ml.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Improving Text Search through ML"
-redirect_from:
-- /documentation/tutorials/text-search-ml.html
 ---
 
 
diff --git a/en/tutorials/text-search.md b/en/tutorials/text-search.md
index 7b2f15116e..c40a65165b 100644
--- a/en/tutorials/text-search.md
+++ b/en/tutorials/text-search.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Text Search Tutorial"
-redirect_from:
-- /documentation/tutorials/text-search.html
 ---
 
 This tutorial will guide you through setting up a simple text search application. 
diff --git a/en/unit-testing.html b/en/unit-testing.html
index b5cd2997bd..2300bec5b0 100644
--- a/en/unit-testing.html
+++ b/en/unit-testing.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Testing"
-redirect_from:
-- /documentation/testing.html
 ---
 
 <p>
diff --git a/en/use-case-shopping.md b/en/use-case-shopping.md
index b18af9cb21..70af6fcbe9 100644
--- a/en/use-case-shopping.md
+++ b/en/use-case-shopping.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Use Case - shopping"
-redirect_from:
-- /documentation/use-case-shopping.html
 ---
 
 The [e-commerce, or shopping, use case](https://github.com/vespa-engine/sample-apps/tree/master/use-case-shopping)
diff --git a/en/use-case-text-image-search.md b/en/use-case-text-image-search.md
index 8762e9aee3..2550058e3f 100644
--- a/en/use-case-text-image-search.md
+++ b/en/use-case-text-image-search.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Use Case - Text-Image Search"
-redirect_from:
-- /documentation/use-case-text-image-search.html
 ---
 
 The [text-image use
diff --git a/en/using-wand-with-vespa.html b/en/using-wand-with-vespa.html
index b246288ddc..99825dfc1d 100644
--- a/en/using-wand-with-vespa.html
+++ b/en/using-wand-with-vespa.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Accelerated OR search using the WAND algorithm"
-redirect_from:
-- /documentation/using-wand-with-vespa.html
 ---
 
 <p>
diff --git a/en/using-zookeeper.md b/en/using-zookeeper.md
index f5e1fe9fcc..f799b3e614 100644
--- a/en/using-zookeeper.md
+++ b/en/using-zookeeper.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Using ZooKeeper"
-redirect_from:
-- /documentation/using-zookeeper.html
 ---
 
 The Vespa container supports [ZooKeeper](https://zookeeper.apache.org/), which
diff --git a/en/vespa-cli.html b/en/vespa-cli.html
index 8494777586..7f8a3b47cb 100644
--- a/en/vespa-cli.html
+++ b/en/vespa-cli.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa CLI"
 redirect_from:
-- /documentation/vespa-cli.html
 - /en/vespa-cli-feed.html
 ---
 
diff --git a/en/vespa-feed-client.html b/en/vespa-feed-client.html
index ddbdc575e1..0bbb010ffa 100644
--- a/en/vespa-feed-client.html
+++ b/en/vespa-feed-client.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "vespa-feed-client"
-redirect_from:
-- /documentation/vespa-feed-client.html
 ---
 <ul>
   <li>Java library and command line client for feeding document operations using
diff --git a/en/vespa-quick-start-java.html b/en/vespa-quick-start-java.html
index cce61ad814..3a86a6843f 100644
--- a/en/vespa-quick-start-java.html
+++ b/en/vespa-quick-start-java.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Quick Start, with Java, using Docker"
-redirect_from:
-- /documentation/vespa-quick-start-java.html
 ---
 
 <p>
diff --git a/en/vespa-quick-start.html b/en/vespa-quick-start.html
index d478862a30..6adf5f9104 100644
--- a/en/vespa-quick-start.html
+++ b/en/vespa-quick-start.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Quick Start, using Docker"
-redirect_from:
-- /documentation/vespa-quick-start.html
 ---
 
 <p>
diff --git a/en/vespa7-release-notes.html b/en/vespa7-release-notes.html
index f6550546ce..f815dc5138 100644
--- a/en/vespa7-release-notes.html
+++ b/en/vespa7-release-notes.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa 7 Release Notes"
-redirect_from:
-- /documentation/vespa7-release-notes.html
 ---
 
 <style>
diff --git a/en/vespa8-release-notes.html b/en/vespa8-release-notes.html
index 4ddb6bb105..98bcfb4163 100644
--- a/en/vespa8-release-notes.html
+++ b/en/vespa8-release-notes.html
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Vespa 8 Release Notes"
-redirect_from:
-- /documentation/vespa8-release-notes.html
 ---
 
 <p>
diff --git a/en/visiting.html b/en/visiting.html
index 4d25f1b387..beb85eaca7 100644
--- a/en/visiting.html
+++ b/en/visiting.html
@@ -2,7 +2,6 @@
 # Copyright Vespa.ai. All rights reserved.
 title: "Visiting"
 redirect_from:
-- /documentation/content/visiting.html
 - /en/content/visiting.html
 ---
 
diff --git a/en/xgboost.md b/en/xgboost.md
index b6fcc3274d..20f342015e 100644
--- a/en/xgboost.md
+++ b/en/xgboost.md
@@ -1,8 +1,6 @@
 ---
 # Copyright Vespa.ai. All rights reserved.
 title: "Ranking with XGBoost Models"
-redirect_from:
-- /documentation/xgboost.html
 ---
 
 Vespa supports importing Gradient Boosting Decision Tree (GBDT) models trained with XGBoost.