diff --git a/fuchsia/component_diagnostics/metrics.yaml b/fuchsia/component_diagnostics/metrics.yaml
index 9943f04..53ce284 100644
--- a/fuchsia/component_diagnostics/metrics.yaml
+++ b/fuchsia/component_diagnostics/metrics.yaml
@@ -13,11 +13,11 @@
 # was read and the data type of the batch read.
 #
 ################################################################################
-- id: 1
-  metric_name: batch_iterator_get_next_requests
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 101
-  metric_dimensions: &bignr_dimensions
+- id: 101
+  metric_name: batch_iterator_get_next_requests_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -31,20 +31,6 @@
   reports:
     - report_name: batch_iterator_get_next_requests
       id: 1
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 101
-  metric_name: batch_iterator_get_next_requests_migrated
-  metric_dimensions: *bignr_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: batch_iterator_get_next_requests
-      id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
@@ -61,11 +47,11 @@
 # and data type experienced the error.
 #
 ################################################################################
-- id: 2
-  metric_name: batch_iterator_get_next_errors
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 102
-  metric_dimensions: &bigne_dimensions
+- id: 102
+  metric_name: batch_iterator_get_next_errors_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -78,20 +64,6 @@
         2: Lifecycle
   reports:
     - report_name: batch_iterator_get_next_errors
-      id: 2
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 102
-  metric_name: batch_iterator_get_next_errors_migrated
-  metric_dimensions: *bigne_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: batch_iterator_get_next_errors
       id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
@@ -108,11 +80,11 @@
 # along with event codes specifying which pipeline and data type was returned.
 #
 ################################################################################
-- id: 3
-  metric_name: batch_iterator_get_next_result_count
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 103
-  metric_dimensions: &bignrc_dimensions
+- id: 103
+  metric_name: batch_iterator_get_next_result_count_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -125,20 +97,6 @@
         2: Lifecycle
   reports:
     - report_name: batch_iterator_get_next_result_count
-      id: 3
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 103
-  metric_name: batch_iterator_get_next_result_count_migrated
-  metric_dimensions: *bignrc_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: batch_iterator_get_next_result_count
       id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
@@ -155,11 +113,11 @@
 # along with event codes specifying which pipeline and data type was returned.
 #
 ################################################################################
-- id: 4
-  metric_name: batch_iterator_get_next_result_errors
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 104
-  metric_dimensions: &bignre_dimensions
+- id: 104
+  metric_name: batch_iterator_get_next_result_errors_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -172,20 +130,6 @@
         2: Lifecycle
   reports:
     - report_name: batch_iterator_get_next_result_errors
-      id: 4
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 104
-  metric_name: batch_iterator_get_next_result_errors_migrated
-  metric_dimensions: *bignre_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: batch_iterator_get_next_result_errors
       id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
@@ -203,11 +147,11 @@
 # specifying which pipeline and data type Archivist was attempting to read.
 #
 ################################################################################
-- id: 5
-  metric_name: component_timeouts_count
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 105
-  metric_dimensions: &ctc_dimensions
+- id: 105
+  metric_name: component_timeouts_count_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -220,20 +164,6 @@
         2: Lifecycle
   reports:
     - report_name: component_timeouts_count
-      id: 5
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 105
-  metric_name: component_timeouts_count_migrated
-  metric_dimensions: *ctc_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: component_timeouts_count
       id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
@@ -250,11 +180,11 @@
 # along with an event code specifying which pipeline was connected to.
 #
 ################################################################################
-- id: 6
-  metric_name: archive_accessor_connections_opened
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 106
-  metric_dimensions: &aaco_dimensions
+- id: 106
+  metric_name: archive_accessor_connections_opened_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -262,20 +192,6 @@
         2: LegacyMetrics
   reports:
     - report_name: archive_accessor_connections_opened
-      id: 6
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 106
-  metric_name: archive_accessor_connections_opened_migrated
-  metric_dimensions: *aaco_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: archive_accessor_connections_opened
       id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
@@ -292,11 +208,11 @@
 # since the last logging.
 #
 ################################################################################
-- id: 7
-  metric_name: lifecycle_events_observed
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 107
-  metric_dimensions: &leo_dimensions
+- id: 107
+  metric_name: lifecycle_events_observed_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: lifecycle_event
       event_codes:
         0: ComponentStart
@@ -305,20 +221,6 @@
   reports:
     - report_name: lifecycle_events_observed
       id: 1
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 107
-  metric_name: lifecycle_events_observed_migrated
-  metric_dimensions: *leo_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: lifecycle_events_observed
-      id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
@@ -334,11 +236,11 @@
 # Every minute we log a uint counter that increments each time a schema is truncated.
 #
 ################################################################################
-- id: 8
-  metric_name: schema_truncation_count
-  metric_type: EVENT_COUNT
-  replacement_metric_id: 108
-  metric_dimensions: &stc_dimensions
+- id: 108
+  metric_name: schema_truncation_count_migrated
+  metric_type: OCCURRENCE
+  metric_semantics: [USAGE_COUNTING]
+  metric_dimensions:
     - dimension: pipeline
       event_codes:
         0: All
@@ -351,20 +253,6 @@
         2: Lifecycle
   reports:
     - report_name: schema_truncation_count
-      id: 8
-      report_type: NUMERIC_AGGREGATION
-      system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
-  meta_data:
-    max_release_stage: GA
-    expiration_date: "2022/07/01"
-
-- id: 108
-  metric_name: schema_truncation_count_migrated
-  metric_dimensions: *stc_dimensions
-  metric_type: OCCURRENCE
-  metric_semantics: [USAGE_COUNTING]
-  reports:
-    - report_name: schema_truncation_count
       id: 1
       report_type: HOURLY_VALUE_NUMERIC_STATS
       privacy_level: NO_ADDED_PRIVACY
@@ -372,3 +260,6 @@
   meta_data:
     max_release_stage: GA
     expiration_date: "2022/07/01"
+
+# Deleted metric IDs that must not be reused.
+deleted_metric_ids: [1,2,3,4,5,6,7,8]