diff --git a/pages/doc/metric_types.md b/pages/doc/metric_types.md
index 90f04867e..de50cd907 100644
--- a/pages/doc/metric_types.md
+++ b/pages/doc/metric_types.md
@@ -16,9 +16,7 @@ summary: Learn about gauges, counters, delta counters, histograms, and spans.
 
 {% include tip.html content="Wavefront co-founder Clement Pang wrote [a Medium article](https://medium.com/@clementpang/thoughts-from-the-front-line-why-wavefront-3d807e2106f) that explains different metric types and why they are so powerful." %}
 
-## Summary of Metric Types
-
-### Metric Types per Data Type
+## Metric Types per Data Type
 
 The following table gives an overview of metric types. We introduce each type in more detail below.
 
@@ -60,6 +58,7 @@ The following table gives an overview of metric types. We introduce each type in
 </tbody>
 </table>
 
+<!--
 ### Metric Types per Retention Period
 
 With the 2024-05 release, we introduce **ephemeral** metrics, which have a short [retention period](terms_of_service.html#data-retention).
@@ -82,6 +81,7 @@ With the 2024-05 release, we introduce **ephemeral** metrics, which have a short
 </tr>
 </tbody>
 </table>
+-->
 
 ## Gauges
 
diff --git a/pages/doc/metrics_managing.md b/pages/doc/metrics_managing.md
index 761c7d634..f1642ab20 100644
--- a/pages/doc/metrics_managing.md
+++ b/pages/doc/metrics_managing.md
@@ -160,7 +160,7 @@ The selected metrics and metric prefixes appear again as long as they are not ob
 
 ### Change the Retention Period of Metrics
 
-With the 2024-05 release, we introduce **ephemeral** metrics, which have short [retention period](terms_of_service.html#data-retention). By default, all ingested metrics are persistent but are convertible to ephemeral.
+With the 2024-05 release, we introduce **ephemeral** metrics, which have short retention period. By default, all ingested metrics are persistent but are convertible to ephemeral.
 
 Converting persistent metrics to ephemeral can significantly improve the [query performance](query_language_performance.html) and reduce the [cardinality](cardinality.html).
 
diff --git a/pages/doc/missing_data_troubleshooting.md b/pages/doc/missing_data_troubleshooting.md
index eb6f277ea..c72ee3ff6 100644
--- a/pages/doc/missing_data_troubleshooting.md
+++ b/pages/doc/missing_data_troubleshooting.md
@@ -7,8 +7,14 @@ permalink: missing_data_troubleshooting.html
 summary: Learn how to troubleshoot when you expect to see data but it doesn't appear in charts.
 ---
 
+Sometimes you expect to see certain data in VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) but, for some reason, it doesn't show up! This can be a frustrating and confusing experience, especially when you urgently need the data. What could be the problem?
+
+<!-- Before removing data retention link
+
 Sometimes you expect to see certain data in VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) but, for some reason, it doesn't show up! This can be a frustrating and confusing experience, especially when you urgently need the data. Operations for Applications does not delete data - the [retention period](terms_of_service.html#data-retention) is 18 months for persistent metrics and 28 days for ephemeral metrics. What could be the problem?
 
+-->
+
 This doc page, based on the extensive experience of our customer success team, helps you investigate, understand, and remedy possible causes. In addition to manually investigating and troubleshooting your issues, you can use the [Query Analyzer](query_language_performance.html#use-the-query-analyzer) which helps you identify where exactly the problem is.
 
 <!---
diff --git a/pages/doc/terms_of_service.md b/pages/doc/terms_of_service.md
index d1fc2d9a9..fdcd961f1 100644
--- a/pages/doc/terms_of_service.md
+++ b/pages/doc/terms_of_service.md
@@ -1,15 +1,16 @@
 ---
-title: Data Retention and Terms of Service
+title: Terms of Service
 keywords: tos
 tags: [tos]
 sidebar: doc_sidebar
 permalink: terms_of_service.html
-summary: Data Retention and Terms of Service
+summary: Terms of Service
 ---
-The terms of service and data retention for VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) differ depending on the contract your company has with VMware. This page gives a summary and links to some relevant information.
+The terms of service for VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) differ depending on the contract your company has with VMware. This page gives a summary and links to some relevant information.
 
 {% include tip.html content="Details vary depending on when you became a customer and on your Service Agreement with VMware." %}
 
+<!--
 ## Data Retention
 
 A production instance retains different types of data for different amounts of time. While this is subject to change, here are the default settings:
@@ -33,11 +34,15 @@ See <a href="metric_types.html#metric-types-per-retention-period">Metric Types p
 </tbody>
 </table>
 
+-->
+
 ## Terms of Service
 
 Your Terms of Service are different depending on when you became a customer.
 
+<!--
 Production clusters currently offer 18 months of full-resolution (no downsampling) data retention for persistent metrics, 28 days for ephemeral metrics, 6 months for histograms, and 7 days for spans. We also have an uptime guarantee, as well as High Availability (HA) and Disaster Recovery (DR) options.
+-->
 
 If you became a customer on or after August 17, 2017:
 
diff --git a/pages/doc/wavefront_pricing.md b/pages/doc/wavefront_pricing.md
index 4509b1b62..274f3dccf 100644
--- a/pages/doc/wavefront_pricing.md
+++ b/pages/doc/wavefront_pricing.md
@@ -26,7 +26,7 @@ For spans, the pricing structure is as follows:
 
 ![Metrics 1pps and Histograms 7pps are the basis, distributed tracing is 22 PPS if intelligent sampling is turned off](images/pricing_model_1.png)
 
-
+<!--
 ## Data Retention
 
 Default data retention is:
@@ -37,6 +37,8 @@ Default data retention is:
 
 Some companies negotiate a longer data retention at a higher price. Ask your administrator for details.
 
+-->
+
 ## Learn More
 
 * [Improve PPS and Prevent Overage](wavefront_usage_info.html)
diff --git a/pages/doc/wavefront_spring_boot_faq.md b/pages/doc/wavefront_spring_boot_faq.md
index c3dbeb0a5..7cbba406a 100644
--- a/pages/doc/wavefront_spring_boot_faq.md
+++ b/pages/doc/wavefront_spring_boot_faq.md
@@ -36,7 +36,7 @@ Follow these steps:
 
 While this is subject to changes at any time, we currently retain 5 days of data and offer no SLA on our free cluster. Freemium accounts that are are inactive for 3 days are automatically deleted.
 
-Production clusters currently offer 18 months of full-resolution (no downsampling) data retention for persistent metrics, 28 days for ephemeral metrics, 6 months for histograms, and 7 days for spans. We also have a 99.95% uptime guarantee, as well as High Availability (HA) and Disaster Recovery (DR) options.
+<!--Production clusters currently offer 18 months of full-resolution (no downsampling) data retention for persistent metrics, 28 days for ephemeral metrics, 6 months for histograms, and 7 days for spans. We also have a 99.95% uptime guarantee, as well as High Availability (HA) and Disaster Recovery (DR) options.-->
 
 ## Why Do I Not See a Link to Access the Free Service on Start-Up?