diff --git a/docs/api/covidcast-signals/indicator-combination-inactive.md b/docs/api/covidcast-signals/indicator-combination-inactive.md
index 65828361f..c01644ba1 100644
--- a/docs/api/covidcast-signals/indicator-combination-inactive.md
+++ b/docs/api/covidcast-signals/indicator-combination-inactive.md
@@ -200,3 +200,30 @@ The resampling method for each input source is as follows:
the reported proportion and sample size.
* *Google Health Trends:* Because we do not have access to the sampling
distribution, we do not resample this signal.
+
+## Compositional Signals: Confirmed Cases and Deaths
+
+* **Earliest issue available:** 7 July 2020
+* **Number of data revisions since 19 May 2020:** 1
+* **Date of last change:** [12 October 2020](../covidcast_changelog.md#indicator-combination)
+* **Available for:** county, msa, hrr, state (see [geography coding docs](../covidcast_geography.md))
+* **Time type:** day (see [date format docs](../covidcast_times.md))
+
+These signals combine the cases and deaths data from JHU and USA Facts. This is
+a straight composition: the signals below use the [JHU signal data](jhu-csse.md)
+for Puerto Rico, and the [USA Facts signal data](usa-facts.md) everywhere else.
+Consult each signal's documentation for information about geographic reporting,
+backfill, and other limitations.
+
+These signals were updated daily until November 18, 2021.
+
+| Signal | 7-day average signal | Description |
+| --- | --- | --- |
+| `confirmed_cumulative_num` | | Cumulative number of confirmed COVID-19 cases
**Earliest date available:** 2020-02-20 |
+| `confirmed_cumulative_prop` | | Cumulative number of confirmed COVID-19 cases per 100,000 population
**Earliest date available:** 2020-02-20 |
+| `confirmed_incidence_num` | `confirmed_7dav_incidence_num` | Number of new confirmed COVID-19 cases, daily
**Earliest date available:** 2020-02-20 |
+| `confirmed_incidence_prop` | `confirmed_7dav_incidence_prop` | Number of new confirmed COVID-19 cases per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
+| `deaths_cumulative_num` | | Cumulative number of confirmed deaths due to COVID-19
**Earliest date available:** 2020-02-20 |
+| `deaths_cumulative_prop` | | Cumulative number of confirmed due to COVID-19, per 100,000 population
**Earliest date available:** 2020-02-20 |
+| `deaths_incidence_num` | `deaths_7dav_incidence_num` | Number of new confirmed deaths due to COVID-19, daily
**Earliest date available:** 2020-02-20 |
+| `deaths_incidence_prop` | `deaths_7dav_incidence_prop` | Number of new confirmed deaths due to COVID-19 per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
diff --git a/docs/api/covidcast-signals/indicator-combination.md b/docs/api/covidcast-signals/indicator-combination.md
deleted file mode 100644
index 993bfe3f2..000000000
--- a/docs/api/covidcast-signals/indicator-combination.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: Indicator Combination
-parent: Data Sources and Signals
-grand_parent: COVIDcast Epidata API
----
-
-# Indicator Combination
-{: .no_toc}
-
-* **Source name:** `indicator-combination`
-
-This source provides signals which are combinations of the other sources,
-calculated or composed by Delphi. It is not a primary data source.
-
-## Table of contents
-{: .no_toc .text-delta}
-
-1. TOC
-{:toc}
-
-## Statistical Combination Signals (Inactive)
-
-The NMF combination signals were deactivated on March 17, 2021. Documentation for
-these signals is still available on the page for
-[inactive indicator-combination signals](indicator-combination-inactive.md).
-
-## Compositional Signals: Confirmed Cases and Deaths
-
-* **Earliest issue available:** 7 July 2020
-* **Number of data revisions since 19 May 2020:** 1
-* **Date of last change:** [12 October 2020](../covidcast_changelog.md#indicator-combination)
-* **Available for:** county, msa, hrr, state (see [geography coding docs](../covidcast_geography.md))
-* **Time type:** day (see [date format docs](../covidcast_times.md))
-
-These signals combine the cases and deaths data from JHU and USA Facts. This is
-a straight composition: the signals below use the [JHU signal data](jhu-csse.md)
-for Puerto Rico, and the [USA Facts signal data](usa-facts.md) everywhere else.
-Consult each signal's documentation for information about geographic reporting,
-backfill, and other limitations.
-
-| Signal | 7-day average signal | Description |
-| --- | --- | --- |
-| `confirmed_cumulative_num` | | Cumulative number of confirmed COVID-19 cases
**Earliest date available:** 2020-02-20 |
-| `confirmed_cumulative_prop` | | Cumulative number of confirmed COVID-19 cases per 100,000 population
**Earliest date available:** 2020-02-20 |
-| `confirmed_incidence_num` | `confirmed_7dav_incidence_num` | Number of new confirmed COVID-19 cases, daily
**Earliest date available:** 2020-02-20 |
-| `confirmed_incidence_prop` | `confirmed_7dav_incidence_prop` | Number of new confirmed COVID-19 cases per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
-| `deaths_cumulative_num` | | Cumulative number of confirmed deaths due to COVID-19
**Earliest date available:** 2020-02-20 |
-| `deaths_cumulative_prop` | | Cumulative number of confirmed due to COVID-19, per 100,000 population
**Earliest date available:** 2020-02-20 |
-| `deaths_incidence_num` | `deaths_7dav_incidence_num` | Number of new confirmed deaths due to COVID-19, daily
**Earliest date available:** 2020-02-20 |
-| `deaths_incidence_prop` | `deaths_7dav_incidence_prop` | Number of new confirmed deaths due to COVID-19 per 100,000 population, daily
**Earliest date available:** 2020-02-20 |
diff --git a/docs/api/covidcast_licensing.md b/docs/api/covidcast_licensing.md
index 90c60a5ce..7b73775df 100644
--- a/docs/api/covidcast_licensing.md
+++ b/docs/api/covidcast_licensing.md
@@ -29,7 +29,7 @@ Attribution license](https://creativecommons.org/licenses/by/4.0/):
* [Doctor Visits](covidcast-signals/doctor-visits.md)
* [Hospital Admissions](covidcast-signals/hospital-admissions.md)
-* [Indicator Combination](covidcast-signals/indicator-combination.md): signals
+* [Indicator Combination](covidcast-signals/indicator-combination-inactive.md): signals
with names beginning `nmf_*`
* [Quidel](covidcast-signals/quidel.md)
* [Symptom Surveys](covidcast-signals/fb-survey.md)
@@ -54,7 +54,7 @@ These data streams are essentially mirrors of their respective sources, and are
published here subject to the original license provided by the source:
* [Google Health Trends](covidcast-signals/ght.md)
-* [Indicator Combination](covidcast-signals/indicator-combination.md): cases and
+* [Indicator Combination](covidcast-signals/indicator-combination-inactive.md): cases and
deaths signals
* [JHU Cases and Deaths](covidcast-signals/jhu-csse.md)
* [SafeGraph Mobility](covidcast-signals/safegraph.md)
diff --git a/docs/api/covidcast_signals.md b/docs/api/covidcast_signals.md
index 816812173..72fd7dee3 100644
--- a/docs/api/covidcast_signals.md
+++ b/docs/api/covidcast_signals.md
@@ -43,10 +43,10 @@ tool](https://delphi.cmu.edu/covidcast/export/):
| Early Indicators | COVID-Like Symptoms in Community | [`fb-survey`](covidcast-signals/fb-survey.md) | `smoothed_hh_cmnty_cli` |
| Late Indicators | COVID Antigen Test Positivity (Quidel) | [`quidel`](covidcast-signals/quidel.md) | `covid_ag_smoothed_pct_positive` |
| Late Indicators | Claims-Based COVID Hospital Admissions | [`hospital-admissions`](covidcast-signals/hospital-admissions.md) | `smoothed_adj_covid19_from_claims` |
-| Late Indicators | Cases | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `confirmed_7dav_incidence_num` |
-| Late Indicators | Cases per 100,000 People | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `confirmed_7dav_incidence_prop` |
-| Late Indicators | Deaths | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `deaths_7dav_incidence_num` |
-| Late Indicators | Deaths per 100,000 People | [`indicator-combination`](covidcast-signals/indicator-combination.md) | `deaths_7dav_incidence_prop` |
+| Late Indicators | Cases | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `confirmed_7dav_incidence_num` |
+| Late Indicators | Cases per 100,000 People | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `confirmed_7dav_incidence_prop` |
+| Late Indicators | Deaths | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `deaths_7dav_incidence_num` |
+| Late Indicators | Deaths per 100,000 People | [`jhu-csse`](covidcast-signals/jhu-csse.md) | `deaths_7dav_incidence_prop` |
## All Available Sources and Signals
diff --git a/src/server/endpoints/covidcast_utils/db_signals.csv b/src/server/endpoints/covidcast_utils/db_signals.csv
index 09e7f137a..2d3c6f703 100644
--- a/src/server/endpoints/covidcast_utils/db_signals.csv
+++ b/src/server/endpoints/covidcast_utils/db_signals.csv
@@ -320,18 +320,18 @@ hospital-admissions,smoothed_covid19,TRUE,smoothed_adj_covid19,FALSE,{base_name}
Discontinued October 1, 2020.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
hospital-admissions,smoothed_covid19_from_claims,FALSE,smoothed_covid19_from_claims,FALSE,COVID-19 Admissions (Claims),TRUE,Estimated percentage of new hospital admissions with COVID-associated diagnoses,"{short_description}, based on counts of claims from health system partners, smoothed in time using a Gaussian linear smoother.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
hospital-admissions,smoothed_covid19_from_claims,TRUE,smoothed_adj_covid19_from_claims,FALSE,{base_name} (Day-adjusted),TRUE,,"{base_short_description}, based on counts of claims from health system partners, smoothed in time using a Gaussian linear smoother, and adjusted to reduce day-of-week effects.",day,Date,Percentage,percent,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,FALSE,confirmed_cumulative_num,FALSE,Confirmed COVID Cases (Cumulative),TRUE,Cumulative confirmed COVID cases,Confirmed COVID-19 cases as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_num,TRUE,"Confirmed COVID Cases (Daily new, 7-day average)",TRUE,"Daily new confirmed COVID cases, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, 7-day average, per 100k people)",TRUE,"Daily new confirmed COVID cases, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_cumulative_prop,FALSE,"Confirmed COVID Cases (Cumulative, per 100k people)",TRUE,"Cumulative confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_num,TRUE,Confirmed COVID Cases (Daily new),TRUE,Daily new confirmed COVID cases,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, per 100k people)",TRUE,"Daily new confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,FALSE,deaths_cumulative_num,FALSE,Confirmed COVID Deaths (Cumulative),TRUE,Cumulative confirmed COVID deaths,Confirmed COVID-19 deaths as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_num,TRUE,"Confirmed COVID Deaths (Daily new, 7-day average)",TRUE,"Daily new confirmed COVID deaths, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, 7-day average, per 100k people)",TRUE,"Daily new confirmed COVID deaths, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_cumulative_prop,FALSE,"Confirmed COVID Deaths (Cumulative, per 100k people)",TRUE,"Cumulative confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_num,TRUE,Confirmed COVID Deaths (Daily new),TRUE,Daily new confirmed COVID deaths,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
-indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, per 100k people)",TRUE,"Daily new confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,FALSE,confirmed_cumulative_num,FALSE,Confirmed COVID Cases (Cumulative),FALSE,Cumulative confirmed COVID cases,Confirmed COVID-19 cases as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_num,TRUE,"Confirmed COVID Cases (Daily new, 7-day average)",FALSE,"Daily new confirmed COVID cases, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_7dav_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, 7-day average, per 100k people)",FALSE,"Daily new confirmed COVID cases, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_cumulative_prop,FALSE,"Confirmed COVID Cases (Cumulative, per 100k people)",FALSE,"Cumulative confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_num,TRUE,Confirmed COVID Cases (Daily new),FALSE,Daily new confirmed COVID cases,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,confirmed_cumulative_num,TRUE,confirmed_incidence_prop,FALSE,"Confirmed COVID Cases (Daily new, per 100k people)",FALSE,"Daily new confirmed COVID cases, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,FALSE,deaths_cumulative_num,FALSE,Confirmed COVID Deaths (Cumulative),FALSE,Cumulative confirmed COVID deaths,Confirmed COVID-19 deaths as reported by [USAFacts](https://usafacts.org/visualizations/coronavirus-covid-19-spread-map/) and [JHU-CSSE](https://github.com/CSSEGISandData/COVID-19),day,Date,Value,count,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_num,TRUE,"Confirmed COVID Deaths (Daily new, 7-day average)",FALSE,"Daily new confirmed COVID deaths, 7-day average ",,day,Date,Value,count,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_7dav_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, 7-day average, per 100k people)",FALSE,"Daily new confirmed COVID deaths, 7-day average, per 100k people",,day,Date,Value,per100k,late,bad,TRUE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_cumulative_prop,FALSE,"Confirmed COVID Deaths (Cumulative, per 100k people)",FALSE,"Cumulative confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,TRUE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_num,TRUE,Confirmed COVID Deaths (Daily new),FALSE,Daily new confirmed COVID deaths,,day,Date,Value,count,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
+indicator-combination-cases-deaths,deaths_cumulative_num,TRUE,deaths_incidence_prop,FALSE,"Confirmed COVID Deaths (Daily new, per 100k people)",FALSE,"Daily new confirmed COVID deaths, per 100k people",,day,Date,Value,per100k,late,bad,FALSE,FALSE,FALSE,FALSE,FALSE,
indicator-combination-nmf,nmf_day_doc_fbc_fbs_ght,nmf_day_doc_fbc_fbs_ght,nmf_day_doc_fbc_fbs_ght,FALSE,NMF Combination (with community symptoms),FALSE,Rank-1 NMF approximation to reconstruct 4 other signals.,"This signal uses a rank-1 approximation, from a nonnegative matrix factorization approach, to identify an underlying signal that best reconstructs the Doctor Visits (smoothed_adj_cli), Facebook Symptoms surveys (smoothed_cli), Facebook Symptoms in Community surveys (smoothed_hh_cmnty_cli), and Search Trends (smoothed_search) indicators. It does not include official reports (cases and deaths from the jhu-csse source). Higher values of the combined signal correspond to higher values of the other indicators, but the scale (units) of the combination is arbitrary. Note that the Search Trends source is not available at the county level, so county values of this signal do not use it.
Discontinued March 17, 2021.",day,Date,Value,raw,early,bad,FALSE,FALSE,FALSE,TRUE,FALSE,