diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 611ba18b0..f7e26edd2 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -2,65 +2,14 @@
 * xref:index.adoc[]
 include::getting-started:partial$nav.adoc[]
 
-.Install & upgrade
-* Overview
-** xref:deploy:choosing-a-deployment-option.adoc[Available Topologies]
-** xref:deploy:versioning-compatibility.adoc[Versioning and Compatibility]
-** xref:deploy:deploying-in-cloud.adoc[Deploying on Cloud]
-*** xref:deploy:deploying-on-aws.adoc[]
-*** xref:deploy:deploying-on-azure.adoc[]
-*** xref:deploy:deploying-on-gcp.adoc[]
-** xref:deploy:deploying-with-docker.adoc[]
-* xref:getting-started:install-enterprise.adoc[Install {enterprise-product-name}]
-** xref:deploy:enterprise-licenses.adoc[Managing Enterprise license keys]
-* xref:getting-started:install-hazelcast.adoc[Install {open-source-product-name}]
-* xref:migrate:lts.adoc[]
-* xref:migrate:community-to-enterprise.adoc[Move to Enterprise from Community/OSS]
-** xref:migrate:rolling-restart.adoc[]
-* xref:migrate:data-migration-tool.adoc[]
-* Upgrades
-** xref:migrate:upgrading-from-jet.adoc[]
-** xref:migrate:upgrading-from-imdg-4.adoc[]
-** xref:migrate:upgrading-from-imdg-3.adoc[]
-** xref:migrate:migration-tool-imdg.adoc[]
-*** xref:migrate:dmt-command-reference.adoc[]
-* xref:release-notes:releases.adoc[Release notes]
-
-
-.Develop & build
-include::architecture:partial$nav.adoc[]
-* xref:cluster-performance:best-practices.adoc[]
-** xref:capacity-planning.adoc[]
-** xref:cluster-performance:performance-tips.adoc[]
-** xref:cluster-performance:back-pressure.adoc[]
-** xref:cluster-performance:pipelining.adoc[]
-** xref:cluster-performance:aws-deployments.adoc[]
-** xref:cluster-performance:threading.adoc[]
-** xref:cluster-performance:near-cache.adoc[]
-** xref:cluster-performance:imap-bulk-read-operations.adoc[]
-** xref:cluster-performance:data-affinity.adoc[]
-* Member/Client Discovery
-** xref:clusters:discovery-mechanisms.adoc[]
-** xref:clusters:discovering-by-tcp.adoc[]
-** xref:clusters:discovering-by-multicast.adoc[]
-** xref:clusters:discovering-native-clients.adoc[]
-include::kubernetes:partial$nav.adoc[]
-include::data-structures:partial$nav.adoc[]
-// Distributed Computing
-* xref:computing:distributed-computing.adoc[]
-// ** xref:data-structures:entry-processor.adoc[] also dupe, commenting for now
-** Executor Services
-include::computing:partial$nav.adoc[]
-// UCN
-** xref:clusters:user-code-namespaces.adoc[]
-include::clusters:partial$nav.adoc[]
-// Pipelines
-// ** xref:pipelines:overview.adoc[Data Pipelines] this duped in partial nav below
-// Ingestion
-* Data Ingestion & Query
+.Develop Solutions
+* Finding the Right Tool
+** xref:cache:overview.adoc[]
 ** xref:ingest:overview.adoc[]
+** xref:computing:distributed-computing.adoc[]
 ** xref:query:overview.adoc[]
-include::mapstore:partial$nav.adoc[]
+include::clients:partial$nav.adoc[]
+include::data-structures:partial$nav.adoc[]
 include::pipelines:partial$nav.adoc[]
 include::query:partial$nav.adoc[]
 * SQL
@@ -129,55 +78,8 @@ include::wan:partial$nav.adoc[]
 ** xref:osgi:design.adoc[]
 ** xref:osgi:using-osgi-service.adoc[]
 
-.Integrate
-* xref:integrate:connectors.adoc[Overview]
-* Integrate with Spring
-** xref:spring:overview.adoc[Overview]
-** xref:spring:configuration.adoc[]
-** xref:spring:springaware.adoc[]
-** xref:spring:add-caching.adoc[]
-** xref:spring:hibernate.adoc[]
-** xref:spring:transaction-manager.adoc[]
-** xref:spring:best-practices.adoc[]
-* xref:integrate:integrate-with-feast.adoc[]
-** xref:integrate:install-connect.adoc[Install and connect Feast]
-** xref:integrate:feast-config.adoc[]
-** xref:integrate:feature-engineering-with-feast.adoc[Get started with Feast batch features]
-** xref:integrate:streaming-features-with-feast.adoc[Get started with Feast streaming features]
-// Connectors
-* Messaging System Connectors
-* xref:integrate:messaging-system-connectors.adoc[Overview]
-** xref:integrate:kafka-connector.adoc[]
-** xref:integrate:kinesis-connector.adoc[]
-** xref:integrate:jms-connector.adoc[]
-// Database and CDC
-* xref:integrate:database-connectors.adoc[Database & CDC Connectors]
-** xref:integrate:jdbc-connector.adoc[]
-** xref:integrate:cdc-connectors.adoc[]
-** xref:integrate:elasticsearch-connector.adoc[]
-** xref:integrate:mongodb-connector.adoc[]
-* File Connectors
-// Need an overview
-** xref:integrate:file-connector.adoc[]
-** xref:integrate:legacy-file-connector.adoc[]
-* Hazelcast Data Structure Connectors
-// Need an overview
-** xref:integrate:map-connector.adoc[]
-** xref:integrate:jcache-connector.adoc[]
-** xref:integrate:list-connector.adoc[]
-** xref:integrate:reliable-topic-connector.adoc[]
-** xref:integrate:vector-collection-connector.adoc[]
-// Kafka Connect
-* xref:integrate:kafka-connect-connectors.adoc[]
-* xref:integrate:socket-connector.adoc[]
-* xref:integrate:test-connectors.adoc[]
-// Custom & Community
-* xref:integrate:custom-connectors.adoc[]
-* Community Connectors
-// Need an overview
-** xref:integrate:pulsar-connector.adoc[]
-** xref:integrate:http-connector.adoc[]
-** xref:integrate:influxdb-connector.adoc[]
+.Upgrade
+include::migrate:partial$nav.adoc[]
 
 .Reference