We remove the hardcoding of cohorts