diff --git a/oximeter/db/src/lib.rs b/oximeter/db/src/lib.rs
index f04f1a99f04..c471a837ea4 100644
--- a/oximeter/db/src/lib.rs
+++ b/oximeter/db/src/lib.rs
@@ -160,7 +160,8 @@ impl From<model::DbTimeseriesSchema> for TimeseriesSchema {
                 schema.timeseries_name.as_str(),
             )
             .expect("Invalid timeseries name in database"),
-            // TODO(ben): Convert from real values once in the DB.
+            // TODO-cleanup: Fill these in from the values in the database. See
+            // https://github.com/oxidecomputer/omicron/issues/5942.
             description: Default::default(),
             version: oximeter::schema::default_schema_version(),
             authz_scope: oximeter::schema::AuthzScope::Fleet,
@@ -241,9 +242,10 @@ pub struct TimeseriesPageSelector {
 
 pub(crate) type TimeseriesKey = u64;
 
-// TODO(ben) The timeseries key needs to take the schema version into account.
-// This will require a schema change to ClickHouse and a destructive update,
-// since all previous keys will be invalid.
+// TODO-cleanup: Add the timeseries version in to the computation of the key.
+// This will require a full drop of the database, since we're changing the
+// sorting key and the timeseries key on each past sample. See
+// https://github.com/oxidecomputer/omicron/issues/5942 for more details.
 pub(crate) fn timeseries_key(sample: &Sample) -> TimeseriesKey {
     timeseries_key_for(
         &sample.timeseries_name,
diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs
index 35fcaace60d..f84adef3075 100644
--- a/oximeter/db/src/model.rs
+++ b/oximeter/db/src/model.rs
@@ -107,7 +107,8 @@ pub(crate) struct DbFieldList {
     pub types: Vec<DbFieldType>,
     #[serde(rename = "fields.source")]
     pub sources: Vec<DbFieldSource>,
-    // TODO(ben): Add descriptions here
+    // TODO-completeness: Populate the description from the database here. See
+    // https://github.com/oxidecomputer/omicron/issues/5942 for more details.
     //#[serde(rename = "fields.description")]
     //pub descriptions: Vec<String>,
 }
@@ -151,8 +152,9 @@ pub(crate) struct DbTimeseriesSchema {
     pub datum_type: DbDatumType,
     #[serde(with = "serde_timestamp")]
     pub created: DateTime<Utc>,
-    // TODO(ben): Add authz scope, version, and units here, once they are
-    // tracked in CRDB and ClickHouse.
+    // TODO-completeness: Add the authorization scope, version, and units once
+    // they are tracked in the database. See
+    // https://github.com/oxidecomputer/omicron/issues/5942 for more details.
 }
 
 impl From<TimeseriesSchema> for DbTimeseriesSchema {