diff --git a/Gemfile b/Gemfile
index e57ea81446c..d61097b29fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,5 +3,4 @@ source "https://rubygems.org"
 gem "jekyll", "~> 3.8.4"
 gem "html-proofer", ">= 3.13.0"
 gem "jekyll-remote-theme", ">= 0.4.1"
-gem "jekyll-open-sdg-plugins", "~> 0.0.16"
-gem "jekyll-get-json", "~> 0.0.2"
+gem "jekyll-open-sdg-plugins", "~> 1.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 39cef7ff2d0..a44494bce0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,7 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-get-json (0.0.2)
-      deep_merge (~> 1.2)
-      jekyll (>= 3.0)
-    jekyll-open-sdg-plugins (0.0.16)
+    jekyll-open-sdg-plugins (1.0.0)
       deep_merge (~> 1.2)
       jekyll (~> 3.0)
     jekyll-remote-theme (0.4.2)
@@ -90,8 +87,7 @@ PLATFORMS
 DEPENDENCIES
   html-proofer (>= 3.13.0)
   jekyll (~> 3.8.4)
-  jekyll-get-json (~> 0.0.2)
-  jekyll-open-sdg-plugins (~> 0.0.16)
+  jekyll-open-sdg-plugins (~> 1.0.0)
   jekyll-remote-theme (>= 0.4.1)
 
 BUNDLED WITH
diff --git a/_config.yml b/_config.yml
index abd2bedaaee..074afe52e9e 100755
--- a/_config.yml
+++ b/_config.yml
@@ -12,18 +12,20 @@ baseurl: "" # the subpath of your site, e.g. /blog
 url: ""
 data_dir: data
 environment: production
-remotedatabaseurl: "https://gsa.github.io/sdg-data-usa/prod"
+remote_data_prefix: "https://gsa.github.io/sdg-data-usa/prod"
 # permalink: /news/:year/:month/:day/:title.html
 
-jekyll_get_json:
-  - data: meta
-    json: 'https://gsa.github.io/sdg-data-usa/prod/meta/all.json'
-  - data: headlines
-    json: 'https://gsa.github.io/sdg-data-usa/prod/headline/all.json'
-  - data: schema
-    json: 'https://gsa.github.io/sdg-data-usa/prod/meta/schema.json'
-  - data: translations
-    json: 'https://gsa.github.io/sdg-translations/translations-0.4.0.json'
+# URL for the "Edit Data" button on indicators.
+data_edit_url: http://prose.io/#GSA/sdg-data-usa/edit/develop/data-wide/indicator_[id].csv
+# URL for the "Edit Metadata" button on indicators.
+metadata_edit_url: http://prose.io/#GSA/sdg-data-usa/edit/develop/meta/[id].md
+
+# Automatically create indicator pages, goal pages, and other required pages.
+create_indicators:
+  layout: indicator
+create_goals:
+  layout: goal
+create_pages: true
 
 analytics:
   ga_prod: 'UA-42145528-4'
@@ -35,11 +37,6 @@ email_contacts:
   functional: datagov@gsa.gov
 ###################################################################################################
 
-# Github Repo for Data
-repo_name: sdg-data-usa
-branch: develop
-org_name: GSA
-
 # Build settings
 markdown: kramdown
 
@@ -82,29 +79,27 @@ menu:
   - path: /faq
     translation_key: menu.faq
 
+footer_menu:
+  - path: /contact
+    translation_key: menu.contact_us
+  - path: /about/cookies-and-privacy/
+    translation_key: menu.cookies
+
 # The list of languages that are translated. The first one is the default.
 languages:
   - en
   - es
   - fr
 
-# This makes sure that all pages have a language.
-defaults:
-  -
-    scope:
-      path: ""
-    values:
-      language: "en"
-
 # Point to remote location of goal images.
 goal_image_base: https://open-sdg.github.io/sdg-translations/assets/img/goals
 
+# Configure the text (or "translation key") to be used on the
+# non-global metadata tab.
+non_global_metadata: indicator.national_metadata
+
 plugins:
   - jekyll-remote-theme
   - jekyll-open-sdg-plugins
-  - jekyll-get-json
-
-remote_theme: open-sdg/open-sdg@0.1.0
 
-custom_css:
-  - /assets/css/custom.css
+remote_theme: open-sdg/open-sdg@1.1.0
diff --git a/_goals/01_no-poverty.md b/_goals/01_no-poverty.md
deleted file mode 100644
index b472bb3e815..00000000000
--- a/_goals/01_no-poverty.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /no-poverty/
-sdg_goal: '1'
-color: '#e5243b'
-layout: goal
----
-
diff --git a/_goals/02_zero-hunger.md b/_goals/02_zero-hunger.md
deleted file mode 100644
index 74d0518ac4b..00000000000
--- a/_goals/02_zero-hunger.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /zero-hunger/
-sdg_goal: '2'
-color: '#e5b735'
-layout: goal
----
-
diff --git a/_goals/03_good-health-and-well-being.md b/_goals/03_good-health-and-well-being.md
deleted file mode 100644
index 8a8953d15ac..00000000000
--- a/_goals/03_good-health-and-well-being.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /good-health-and-well-being/
-sdg_goal: '3'
-color: '#4c9f38'
-layout: goal
----
-
diff --git a/_goals/04_quality-education.md b/_goals/04_quality-education.md
deleted file mode 100644
index 372606a71f4..00000000000
--- a/_goals/04_quality-education.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /quality-education/
-sdg_goal: '4'
-color: '#c5192d'
-layout: goal
----
-
diff --git a/_goals/05_gender-equality.md b/_goals/05_gender-equality.md
deleted file mode 100644
index fe329c412de..00000000000
--- a/_goals/05_gender-equality.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /gender-equality/
-sdg_goal: '5'
-color: '#ff3a21'
-layout: goal
----
-
diff --git a/_goals/06_clean-water-and-sanitation.md b/_goals/06_clean-water-and-sanitation.md
deleted file mode 100644
index 3e399e165db..00000000000
--- a/_goals/06_clean-water-and-sanitation.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /clean-water-and-sanitation/
-sdg_goal: '6'
-color: '#26bde2'
-layout: goal
----
-
diff --git a/_goals/07_affordable-and-clean-energy.md b/_goals/07_affordable-and-clean-energy.md
deleted file mode 100644
index 33e10d072e6..00000000000
--- a/_goals/07_affordable-and-clean-energy.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /affordable-and-clean-energy/
-sdg_goal: '7'
-color: '#fcc30b'
-layout: goal
----
-
diff --git a/_goals/08_decent-jobs-and-economic-growth.md b/_goals/08_decent-jobs-and-economic-growth.md
deleted file mode 100644
index 4f3e97e46a2..00000000000
--- a/_goals/08_decent-jobs-and-economic-growth.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /decent-jobs-and-economic-growth/
-sdg_goal: '8'
-color: '#a21942'
-layout: goal
----
-
diff --git a/_goals/09_industry-innovation-and-infrastructure.md b/_goals/09_industry-innovation-and-infrastructure.md
deleted file mode 100644
index 3794e571b6e..00000000000
--- a/_goals/09_industry-innovation-and-infrastructure.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /industry-innovation-and-infrastructure/
-sdg_goal: '9'
-color: '#fd6925'
-layout: goal
----
-
diff --git a/_goals/10_reduced-inequalities.md b/_goals/10_reduced-inequalities.md
deleted file mode 100644
index 9f0da3b2fa8..00000000000
--- a/_goals/10_reduced-inequalities.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /reduced-inequalities/
-sdg_goal: '10'
-color: '#dd1367'
-layout: goal
----
-
diff --git a/_goals/11_sustainable-cities-communities.md b/_goals/11_sustainable-cities-communities.md
deleted file mode 100644
index 77e96a1333f..00000000000
--- a/_goals/11_sustainable-cities-communities.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /sustainable-cities-communities/
-sdg_goal: '11'
-color: '#fd9d24'
-layout: goal
----
-
diff --git a/_goals/12_responsible-consumption-and-production.md b/_goals/12_responsible-consumption-and-production.md
deleted file mode 100644
index ac0cf86763a..00000000000
--- a/_goals/12_responsible-consumption-and-production.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /responsible-consumption-and-production/
-sdg_goal: '12'
-color: '#c9992d'
-layout: goal
----
-
diff --git a/_goals/13_climate-action.md b/_goals/13_climate-action.md
deleted file mode 100644
index 687f3d88b3b..00000000000
--- a/_goals/13_climate-action.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /climate-action/
-sdg_goal: '13'
-color: '#3f7e44'
-layout: goal
----
-
diff --git a/_goals/14_life-below-water.md b/_goals/14_life-below-water.md
deleted file mode 100644
index 292a66e5b7d..00000000000
--- a/_goals/14_life-below-water.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /life-below-water/
-sdg_goal: '14'
-color: '#0a97d9'
-layout: goal
----
-
diff --git a/_goals/15_life-on-land.md b/_goals/15_life-on-land.md
deleted file mode 100644
index 4d5f5b93f5e..00000000000
--- a/_goals/15_life-on-land.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /life-on-land/
-sdg_goal: '15'
-color: '#56c02b'
-layout: goal
----
-
diff --git a/_goals/16_peace-and-justice-strong-institutions.md b/_goals/16_peace-and-justice-strong-institutions.md
deleted file mode 100644
index d6158445bd8..00000000000
--- a/_goals/16_peace-and-justice-strong-institutions.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /peace-and-justice-strong-institutions/
-sdg_goal: '16'
-color: '#00689d'
-layout: goal
----
-
diff --git a/_goals/17_partnerships-for-the-goals.md b/_goals/17_partnerships-for-the-goals.md
deleted file mode 100644
index 7c65426e2c3..00000000000
--- a/_goals/17_partnerships-for-the-goals.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: /partnerships-for-the-goals/
-sdg_goal: '17'
-color: '#19486a'
-layout: goal
----
-
diff --git a/_goals/es/01_no-poverty.md b/_goals/es/01_no-poverty.md
deleted file mode 100644
index 4bc6cbe202a..00000000000
--- a/_goals/es/01_no-poverty.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#e5243b'
-language: es
-layout: goal
-permalink: /es/no-poverty/
-sdg_goal: '1'
----
\ No newline at end of file
diff --git a/_goals/es/02_zero-hunger.md b/_goals/es/02_zero-hunger.md
deleted file mode 100644
index c9940071c10..00000000000
--- a/_goals/es/02_zero-hunger.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#e5b735'
-language: es
-layout: goal
-permalink: /es/zero-hunger/
-sdg_goal: '2'
----
\ No newline at end of file
diff --git a/_goals/es/03_good-health-and-well-being.md b/_goals/es/03_good-health-and-well-being.md
deleted file mode 100644
index ea17309eaf3..00000000000
--- a/_goals/es/03_good-health-and-well-being.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#4c9f38'
-language: es
-layout: goal
-permalink: /es/good-health-and-well-being/
-sdg_goal: '3'
----
\ No newline at end of file
diff --git a/_goals/es/04_quality-education.md b/_goals/es/04_quality-education.md
deleted file mode 100644
index 240db1f8d7f..00000000000
--- a/_goals/es/04_quality-education.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#c5192d'
-language: es
-layout: goal
-permalink: /es/quality-education/
-sdg_goal: '4'
----
\ No newline at end of file
diff --git a/_goals/es/05_gender-equality.md b/_goals/es/05_gender-equality.md
deleted file mode 100644
index 6314d4ff8ee..00000000000
--- a/_goals/es/05_gender-equality.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#ff3a21'
-language: es
-layout: goal
-permalink: /es/gender-equality/
-sdg_goal: '5'
----
\ No newline at end of file
diff --git a/_goals/es/06_clean-water-and-sanitation.md b/_goals/es/06_clean-water-and-sanitation.md
deleted file mode 100644
index fc63a94db59..00000000000
--- a/_goals/es/06_clean-water-and-sanitation.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#26bde2'
-language: es
-layout: goal
-permalink: /es/clean-water-and-sanitation/
-sdg_goal: '6'
----
\ No newline at end of file
diff --git a/_goals/es/07_affordable-and-clean-energy.md b/_goals/es/07_affordable-and-clean-energy.md
deleted file mode 100644
index 9a6b482abfb..00000000000
--- a/_goals/es/07_affordable-and-clean-energy.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#fcc30b'
-language: es
-layout: goal
-permalink: /es/affordable-and-clean-energy/
-sdg_goal: '7'
----
\ No newline at end of file
diff --git a/_goals/es/08_decent-jobs-and-economic-growth.md b/_goals/es/08_decent-jobs-and-economic-growth.md
deleted file mode 100644
index 12d1e0867d5..00000000000
--- a/_goals/es/08_decent-jobs-and-economic-growth.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#a21942'
-language: es
-layout: goal
-permalink: /es/decent-jobs-and-economic-growth/
-sdg_goal: '8'
----
\ No newline at end of file
diff --git a/_goals/es/09_industry-innovation-and-infrastructure.md b/_goals/es/09_industry-innovation-and-infrastructure.md
deleted file mode 100644
index 2e7f144d944..00000000000
--- a/_goals/es/09_industry-innovation-and-infrastructure.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#fd6925'
-language: es
-layout: goal
-permalink: /es/industry-innovation-and-infrastructure/
-sdg_goal: '9'
----
\ No newline at end of file
diff --git a/_goals/es/10_reduced-inequalities.md b/_goals/es/10_reduced-inequalities.md
deleted file mode 100644
index 3398b05db5e..00000000000
--- a/_goals/es/10_reduced-inequalities.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#dd1367'
-language: es
-layout: goal
-permalink: /es/reduced-inequalities/
-sdg_goal: '10'
----
\ No newline at end of file
diff --git a/_goals/es/11_sustainable-cities-communities.md b/_goals/es/11_sustainable-cities-communities.md
deleted file mode 100644
index 8f32ef586a9..00000000000
--- a/_goals/es/11_sustainable-cities-communities.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#fd9d24'
-language: es
-layout: goal
-permalink: /es/sustainable-cities-communities/
-sdg_goal: '11'
----
\ No newline at end of file
diff --git a/_goals/es/12_responsible-consumption-and-production.md b/_goals/es/12_responsible-consumption-and-production.md
deleted file mode 100644
index 97225f03785..00000000000
--- a/_goals/es/12_responsible-consumption-and-production.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#c9992d'
-language: es
-layout: goal
-permalink: /es/responsible-consumption-and-production/
-sdg_goal: '12'
----
\ No newline at end of file
diff --git a/_goals/es/13_climate-action.md b/_goals/es/13_climate-action.md
deleted file mode 100644
index 5afbba12f23..00000000000
--- a/_goals/es/13_climate-action.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#3f7e44'
-language: es
-layout: goal
-permalink: /es/climate-action/
-sdg_goal: '13'
----
\ No newline at end of file
diff --git a/_goals/es/14_life-below-water.md b/_goals/es/14_life-below-water.md
deleted file mode 100644
index 75db6e9b989..00000000000
--- a/_goals/es/14_life-below-water.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#0a97d9'
-language: es
-layout: goal
-permalink: /es/life-below-water/
-sdg_goal: '14'
----
\ No newline at end of file
diff --git a/_goals/es/15_life-on-land.md b/_goals/es/15_life-on-land.md
deleted file mode 100644
index bca7db33682..00000000000
--- a/_goals/es/15_life-on-land.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#56c02b'
-language: es
-layout: goal
-permalink: /es/life-on-land/
-sdg_goal: '15'
----
\ No newline at end of file
diff --git a/_goals/es/16_peace-and-justice-strong-institutions.md b/_goals/es/16_peace-and-justice-strong-institutions.md
deleted file mode 100644
index a9be51e3364..00000000000
--- a/_goals/es/16_peace-and-justice-strong-institutions.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#00689d'
-language: es
-layout: goal
-permalink: /es/peace-and-justice-strong-institutions/
-sdg_goal: '16'
----
\ No newline at end of file
diff --git a/_goals/es/17_partnerships-for-the-goals.md b/_goals/es/17_partnerships-for-the-goals.md
deleted file mode 100644
index 386ce76f642..00000000000
--- a/_goals/es/17_partnerships-for-the-goals.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#19486a'
-language: es
-layout: goal
-permalink: /es/partnerships-for-the-goals/
-sdg_goal: '17'
----
\ No newline at end of file
diff --git a/_goals/fr/01_no-poverty.md b/_goals/fr/01_no-poverty.md
deleted file mode 100644
index ad38463e962..00000000000
--- a/_goals/fr/01_no-poverty.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#e5243b'
-language: fr
-layout: goal
-permalink: /fr/no-poverty/
-sdg_goal: '1'
----
\ No newline at end of file
diff --git a/_goals/fr/02_zero-hunger.md b/_goals/fr/02_zero-hunger.md
deleted file mode 100644
index 7322680632b..00000000000
--- a/_goals/fr/02_zero-hunger.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#e5b735'
-language: fr
-layout: goal
-permalink: /fr/zero-hunger/
-sdg_goal: '2'
----
\ No newline at end of file
diff --git a/_goals/fr/03_good-health-and-well-being.md b/_goals/fr/03_good-health-and-well-being.md
deleted file mode 100644
index bfcd7e16c53..00000000000
--- a/_goals/fr/03_good-health-and-well-being.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#4c9f38'
-language: fr
-layout: goal
-permalink: /fr/good-health-and-well-being/
-sdg_goal: '3'
----
\ No newline at end of file
diff --git a/_goals/fr/04_quality-education.md b/_goals/fr/04_quality-education.md
deleted file mode 100644
index 4e8953e62c7..00000000000
--- a/_goals/fr/04_quality-education.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#c5192d'
-language: fr
-layout: goal
-permalink: /fr/quality-education/
-sdg_goal: '4'
----
\ No newline at end of file
diff --git a/_goals/fr/05_gender-equality.md b/_goals/fr/05_gender-equality.md
deleted file mode 100644
index 2bc39758eb5..00000000000
--- a/_goals/fr/05_gender-equality.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#ff3a21'
-language: fr
-layout: goal
-permalink: /fr/gender-equality/
-sdg_goal: '5'
----
\ No newline at end of file
diff --git a/_goals/fr/06_clean-water-and-sanitation.md b/_goals/fr/06_clean-water-and-sanitation.md
deleted file mode 100644
index 702bbe3f7e5..00000000000
--- a/_goals/fr/06_clean-water-and-sanitation.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#26bde2'
-language: fr
-layout: goal
-permalink: /fr/clean-water-and-sanitation/
-sdg_goal: '6'
----
\ No newline at end of file
diff --git a/_goals/fr/07_affordable-and-clean-energy.md b/_goals/fr/07_affordable-and-clean-energy.md
deleted file mode 100644
index a768e4c38b5..00000000000
--- a/_goals/fr/07_affordable-and-clean-energy.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#fcc30b'
-language: fr
-layout: goal
-permalink: /fr/affordable-and-clean-energy/
-sdg_goal: '7'
----
\ No newline at end of file
diff --git a/_goals/fr/08_decent-jobs-and-economic-growth.md b/_goals/fr/08_decent-jobs-and-economic-growth.md
deleted file mode 100644
index 57218666d99..00000000000
--- a/_goals/fr/08_decent-jobs-and-economic-growth.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#a21942'
-language: fr
-layout: goal
-permalink: /fr/decent-jobs-and-economic-growth/
-sdg_goal: '8'
----
\ No newline at end of file
diff --git a/_goals/fr/09_industry-innovation-and-infrastructure.md b/_goals/fr/09_industry-innovation-and-infrastructure.md
deleted file mode 100644
index 77b6912e3b0..00000000000
--- a/_goals/fr/09_industry-innovation-and-infrastructure.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#fd6925'
-language: fr
-layout: goal
-permalink: /fr/industry-innovation-and-infrastructure/
-sdg_goal: '9'
----
\ No newline at end of file
diff --git a/_goals/fr/10_reduced-inequalities.md b/_goals/fr/10_reduced-inequalities.md
deleted file mode 100644
index 7084459f4b7..00000000000
--- a/_goals/fr/10_reduced-inequalities.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#dd1367'
-language: fr
-layout: goal
-permalink: /fr/reduced-inequalities/
-sdg_goal: '10'
----
\ No newline at end of file
diff --git a/_goals/fr/11_sustainable-cities-communities.md b/_goals/fr/11_sustainable-cities-communities.md
deleted file mode 100644
index 520d2c9273f..00000000000
--- a/_goals/fr/11_sustainable-cities-communities.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#fd9d24'
-language: fr
-layout: goal
-permalink: /fr/sustainable-cities-communities/
-sdg_goal: '11'
----
\ No newline at end of file
diff --git a/_goals/fr/12_responsible-consumption-and-production.md b/_goals/fr/12_responsible-consumption-and-production.md
deleted file mode 100644
index a793bd41d27..00000000000
--- a/_goals/fr/12_responsible-consumption-and-production.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#c9992d'
-language: fr
-layout: goal
-permalink: /fr/responsible-consumption-and-production/
-sdg_goal: '12'
----
\ No newline at end of file
diff --git a/_goals/fr/13_climate-action.md b/_goals/fr/13_climate-action.md
deleted file mode 100644
index 9179f305533..00000000000
--- a/_goals/fr/13_climate-action.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#3f7e44'
-language: fr
-layout: goal
-permalink: /fr/climate-action/
-sdg_goal: '13'
----
\ No newline at end of file
diff --git a/_goals/fr/14_life-below-water.md b/_goals/fr/14_life-below-water.md
deleted file mode 100644
index f49240e82bd..00000000000
--- a/_goals/fr/14_life-below-water.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#0a97d9'
-language: fr
-layout: goal
-permalink: /fr/life-below-water/
-sdg_goal: '14'
----
\ No newline at end of file
diff --git a/_goals/fr/15_life-on-land.md b/_goals/fr/15_life-on-land.md
deleted file mode 100644
index 3ed952cf0f5..00000000000
--- a/_goals/fr/15_life-on-land.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#56c02b'
-language: fr
-layout: goal
-permalink: /fr/life-on-land/
-sdg_goal: '15'
----
\ No newline at end of file
diff --git a/_goals/fr/16_peace-and-justice-strong-institutions.md b/_goals/fr/16_peace-and-justice-strong-institutions.md
deleted file mode 100644
index 782f1dd687a..00000000000
--- a/_goals/fr/16_peace-and-justice-strong-institutions.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#00689d'
-language: fr
-layout: goal
-permalink: /fr/peace-and-justice-strong-institutions/
-sdg_goal: '16'
----
\ No newline at end of file
diff --git a/_goals/fr/17_partnerships-for-the-goals.md b/_goals/fr/17_partnerships-for-the-goals.md
deleted file mode 100644
index 917f5ab6d20..00000000000
--- a/_goals/fr/17_partnerships-for-the-goals.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-color: '#19486a'
-language: fr
-layout: goal
-permalink: /fr/partnerships-for-the-goals/
-sdg_goal: '17'
----
\ No newline at end of file
diff --git a/_includes/assets/js/mapView.js b/_includes/assets/js/mapView.js
deleted file mode 100644
index 4b2f566d5dc..00000000000
--- a/_includes/assets/js/mapView.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var mapView = function () {
-
-  "use strict";
-
-  this.initialise = function(geoData, geoCodeRegEx) {
-    $('.map').show();
-    $('#map').sdgMap({
-      geoData: geoData,
-      geoCodeRegEx: geoCodeRegEx,
-      serviceUrl: 'http://brock.tips/geojson-us-states/us-states.geo.json',
-      nameProperty: 'NAME',
-      idProperty: 'STUSPS',
-      width: 710,
-      height: 350,
-      projectionFunc: d3.geoAlbersUsa,
-    });
-  }
-};
diff --git a/_includes/components/dev-disclaimer.html b/_includes/components/dev-disclaimer.html
index 3db0724fae6..331dbaadff7 100644
--- a/_includes/components/dev-disclaimer.html
+++ b/_includes/components/dev-disclaimer.html
@@ -2,22 +2,22 @@
   <div class="row alert" role="alert">
     {%- if site.environment == 'staging' -%}
       <div class="col-sm-9 col-md-6">
-        {{ t.usa.disclaimer_staging }}
+        {{ page.t.usa.disclaimer_staging }}
       </div>
       <div class="col-md-3 hidden-xs hidden-sm">
-        {{ t.usa.work_in_progress }}
+        {{ page.t.usa.work_in_progress }}
       </div>
       <div class="col-sm-3 text-right hidden-xs">
         <a class="btn btn-default btn-xs" href="{{ site.baseurl }}{{ baseurl_folder }}{% link _pages/admin.md %}">
-          {{ t.usa.login_logout }}
+          {{ page.t.usa.login_logout }}
         </a>
       </div>
     {%- else -%}
       <div class="col-md-9">
-        {{ t.usa.disclaimer_production }}
+        {{ page.t.usa.disclaimer_production }}
       </div>
       <div class="col-md-3 hidden-xs hidden-sm text-right">
-        {{ t.usa.work_in_progress }}
+        {{ page.t.usa.work_in_progress }}
       </div>
     {%- endif -%}
   </div>
diff --git a/_includes/components/indicator-content.html b/_includes/components/indicator-content.html
index dff9bc924bc..72c7fdec7ee 100644
--- a/_includes/components/indicator-content.html
+++ b/_includes/components/indicator-content.html
@@ -12,8 +12,8 @@
       {% if data_notice_end > site_generated_timestamp %}
 
         <div class="alert warning" >
-          <h4>{{ t.data_notice.data_notice }}</h4>
-          <p>{{ t.data_notice[sdg_data_notice.notice] }}</p>
+          <h4>{{ page.t.data_notice.data_notice }}</h4>
+          <p>{{ page.t.data_notice[sdg_data_notice.notice] }}</p>
         </div>
 
       {% endif %}
@@ -22,5 +22,5 @@ <h4>{{ t.data_notice.data_notice }}</h4>
     {% endif %}
   {% endfor %}
 
-  {{ meta.page_content | markdownify }}
+  {{ page.indicator.page_content | markdownify }}
 </div>
diff --git a/_includes/footer.html b/_includes/footer.html
index a37f5019222..d57444ec3d1 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,9 +1,28 @@
 <footer role="contentinfo">
   <div class="container">
     <div class="row">
-      <div class="col-xs-9">
-        <a href="{{ site.baseurl }}{{ baseurl_folder }}{% link _pages/contact.md %}">{{ t.menu.contact_us }}</a> |
-        <a href="{{ site.baseurl }}{{ baseurl_folder }}{% link _pages/cookies.md %}">{{ t.menu.cookies }}</a>
+      <div class="col-xs-12">
+        <div id="footerLinks">
+          <ul>
+            <li><a href="https://open-sdg.readthedocs.io/en/latest/">{{ page.t.general.built_using_open_sdg }}</a></li>
+            {% if site.footer_menu %}
+              {% for item in site.footer_menu %}
+                <li>
+                {% if item.path contains ":" %}
+                  <a href="{{ item.path }}" target="_blank">{{ item.translation_key | t }}</a>
+                {% else %}
+                  {%- assign item_path = item.path -%}
+                  {%- assign item_path_first = item_path | slice: 0 %}
+                  {%- if item_path_first == '/' -%}
+                    {%- assign item_path = item_path | slice: 1, item_path.size -%}
+                  {%- endif -%}
+                  <a href="{{ page.baseurl }}{{ item_path }}">{{ item.translation_key | t }}</a>
+                {% endif %}
+                </li>
+              {% endfor %}
+            {% endif %}
+          </ul>
+        </div>
       </div>
     </div>
   </div>
@@ -13,24 +32,14 @@
 <script id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA"></script>
 <!-- Google Analytics -->
 
-<script>
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-{% if site.environment == 'staging' %}
+<!-- /.container </div> -->
+{% include scripts.html %}
 
-{% else %}
-ga('create', '{{ site.analytics['ga_prod'] }}', 'auto');
-// anonymize user IPs (chops off the last IP triplet)
-ga('set', 'anonymizeIp', true);
-// forces SSL even if the page were somehow loaded over http://
-ga('set', 'forceSSL', true);
-ga('send', 'pageview');
-{% endif %}
+{% if site.analytics.ga_prod and site.analytics.ga_prod != '' %}
+<script>
+  initialiseGoogleAnalytics();
 </script>
+{% endif %}
 
-<!-- /.container </div> -->
-{% include scripts.html %}
 </body>
 </html>
diff --git a/_includes/head.html b/_includes/head.html
deleted file mode 100644
index 2d075f149e1..00000000000
--- a/_includes/head.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" class="no-js">
-    <head>
-        {%- include multilingual.html -%}
-        <script>var translations = {};</script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-        <!-- Basic Page Needs
-        ================================================== -->
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Mobile Specific Metas
-        ================================================== -->
-        <meta name="HandheldFriendly" content="True">
-        <meta name="MobileOptimized" content="320">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <!-- Title and meta description
-        ================================================== -->
-        {% assign goal = site.goals | where: "sdg_goal", page.sdg_goal | first %}
-        {% capture page_title %}
-        {{ t.general.indicator }} {{ page.indicator }} - {{ t.general.goal }} {{ goal.goal }} - {{ goal.short }}
-        {% endcapture %}
-        <title>{% if page.indicator %}{{ page_title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
-        <meta name="description" content="">
-        <meta property="og:description" content="">
-        {% if site.environment == 'staging' %}
-        <meta name="robots" content="noindex, nofollow">
-        {% endif %}
-        <link rel="canonical" href="/">
-
-        {% comment %}
-        <!--[if lt IE 9]>
-        <script src="/assets/js/vendor/html5shiv.js"></script>
-        <script src="/assets/js/vendor/respond.js"></script>
-        <script src="/assets/js/vendor/selectivizr-min.js"></script>
-        <![endif]-->
-        {% endcomment %}
-
-        <!--[if IE 9]>
-        <script src="{{ site.baseurl }}/assets/js/lib/classList.js"></script>
-        <![endif]-->
-
-        <!-- Favicons ================================================== -->
-        <!-- 128x128 -->
-        <link rel="shortcut icon" type="image/ico" href="{{ site.baseurl }}/assets/img/favicons/favicon.ico">
-        <link rel="icon" type="image/png" href="{{ site.baseurl }}/assets/img/favicons/favicon.png"><!-- 192x192, as recommended for Android
-        http://updates.html5rocks.com/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
-        -->
-
-        {% comment %}
-        <link rel="icon" type="image/png" sizes="192x192" href="{{ site.baseurl }}/assets/img/favicons/favicon-192.png"><!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
-        <link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}/assets/img/favicons/favicon-57.png"><!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.baseurl }}/assets/img/favicons/favicon-72.png"><!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
-        <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.baseurl }}/assets/img/favicons/favicon-114.png"><!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/assets/img/favicons/favicon-144.png"><!-- CSS
-        ================================================== -->
-        {% endcomment %}
-
-        {% assign cache_bust = site.time | date: "%Y%m%d%H%M%S" %}
-        <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
-        <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
-        <link rel="stylesheet" href="https://cdn.datatables.net/fixedcolumns/3.2.3/css/fixedColumns.dataTables.min.css">
-        <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/default.css?v={{ cache_bust }}">
-        <link href="https://fonts.googleapis.com/css?family=Open+Sans|Roboto" rel="stylesheet">
-        {%- if site.custom_css -%}
-          {%- for custom_css_file in site.custom_css -%}
-            <link rel="stylesheet" href="{{ site.baseurl }}{{ custom_css_file }}?v={{ cache_bust }}">
-          {%- endfor -%}
-        {%- endif -%}
-    </head>
-<body class="language-{{ current_language }}">
-<!-- <div class="container"> -->
diff --git a/_includes/scripts.html b/_includes/scripts.html
deleted file mode 100644
index 2fb958a4678..00000000000
--- a/_includes/scripts.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
-<script src="//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
-<script src="//cdn.datatables.net/1.10.16/js/dataTables.bootstrap.min.js"></script>
-<script src="//cdn.datatables.net/fixedcolumns/3.2.3/js/dataTables.fixedColumns.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.0/Chart.bundle.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/4.13.0/d3.min.js"></script>
-<script type="text/javascript"> window.loop11_key = "0104054b3b56d396b42e668dfe096cee161454a8"; </script>
-<script src="//cdn.jsdelivr.net/bluebird/3.5.0/bluebird.min.js"></script>
-<script src="//cdn.loop11.com/my/loop11.js" type="text/javascript" async="async"></script>
-<script>
-  var remoteDataBaseUrl = '{{ site.remotedatabaseurl }}';
-</script>
-<script src='{{ site.baseurl }}/assets/js/sdg.js?v={{ cache_bust }}'></script>
-<script>
-$(function() {
-    if($('#indicatorData').length) {
-      var domData = $('#indicatorData').data();
-
-      $('.async-loading').each(function(i, obj) {
-          $(obj).append($('<img />').attr('src', $(obj).data('img')));
-      });
-
-      $.ajax({
-        url: '{{ site.remotedatabaseurl }}/comb/' + domData.id + '.json',
-        success: function(res) {
-
-          $('.async-loading').remove();
-          $('.async-loaded').show();
-
-          var model = new indicatorModel({
-            data: res.data,
-            edgesData: res.edges,
-            geoCodeRegEx: domData.geocoderegex,
-            showMap: domData.showmap,
-            country: domData.country,
-            indicatorId: domData.indicatorid,
-            shortIndicatorId: domData.id,
-            chartTitle: domData.charttitle,
-            measurementUnit: domData.measurementunit,
-            dataSource: domData.datasource,
-            geographicalArea: domData.geographicalarea,
-            showData: domData.showdata,
-            footnote: domData.footnote,
-            graphType: domData.graphtype
-          }),
-          view  = new indicatorView(model, {
-            rootElement: '#indicatorData',
-            legendElement: '#plotLegend',
-            maxChartHeight: 600,
-            tableColumnDefs: [
-              { maxCharCount: 25 }, // nowrap
-              { maxCharCount: 35, width: 200 },
-              { maxCharCount: Infinity, width: 250 }
-            ]
-          }),
-          controller = new indicatorController(model, view);
-          controller.initialise();
-        }
-      });
-    }
-
-    var switcher = new accessibilitySwitcher();
-
-
-});
-</script>
diff --git a/_indicators/1-1-1.md b/_indicators/1-1-1.md
deleted file mode 100644
index 6ee75dcaa2d..00000000000
--- a/_indicators/1-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.1.1
-layout: indicator
-permalink: /1-1-1/
----
-
-
diff --git a/_indicators/1-2-1.md b/_indicators/1-2-1.md
deleted file mode 100644
index 2351d52ee7c..00000000000
--- a/_indicators/1-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.2.1
-layout: indicator
-permalink: /1-2-1/
----
-
-
diff --git a/_indicators/1-2-2.md b/_indicators/1-2-2.md
deleted file mode 100644
index 13e34a8dec2..00000000000
--- a/_indicators/1-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.2.2
-layout: indicator
-permalink: /1-2-2/
----
-
-
diff --git a/_indicators/1-3-1.md b/_indicators/1-3-1.md
deleted file mode 100644
index 3b78e997752..00000000000
--- a/_indicators/1-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.3.1
-layout: indicator
-permalink: /1-3-1/
----
-
-
diff --git a/_indicators/1-4-1.md b/_indicators/1-4-1.md
deleted file mode 100644
index 5df500031e7..00000000000
--- a/_indicators/1-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.4.1
-layout: indicator
-permalink: /1-4-1/
----
-
-
diff --git a/_indicators/1-4-2.md b/_indicators/1-4-2.md
deleted file mode 100644
index d669722d121..00000000000
--- a/_indicators/1-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.4.2
-layout: indicator
-permalink: /1-4-2/
----
-
-
diff --git a/_indicators/1-5-1.md b/_indicators/1-5-1.md
deleted file mode 100644
index 0bd552b3734..00000000000
--- a/_indicators/1-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.5.1
-layout: indicator
-permalink: /1-5-1/
----
-
-
diff --git a/_indicators/1-5-2.md b/_indicators/1-5-2.md
deleted file mode 100644
index c9d8cfb56da..00000000000
--- a/_indicators/1-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.5.2
-layout: indicator
-permalink: /1-5-2/
----
-
-
diff --git a/_indicators/1-5-3.md b/_indicators/1-5-3.md
deleted file mode 100644
index 0210d5ff552..00000000000
--- a/_indicators/1-5-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.5.3
-layout: indicator
-permalink: /1-5-3/
----
-
-
diff --git a/_indicators/1-5-4.md b/_indicators/1-5-4.md
deleted file mode 100644
index 5f1a38dda72..00000000000
--- a/_indicators/1-5-4.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.5.4
-layout: indicator
-permalink: /1-5-4/
----
-
-
diff --git a/_indicators/1-a-1.md b/_indicators/1-a-1.md
deleted file mode 100644
index bb40837d108..00000000000
--- a/_indicators/1-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.a.1
-layout: indicator
-permalink: /1-a-1/
----
-
-
diff --git a/_indicators/1-a-2.md b/_indicators/1-a-2.md
deleted file mode 100644
index b7144069da6..00000000000
--- a/_indicators/1-a-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.a.2
-layout: indicator
-permalink: /1-a-2/
----
-
-
diff --git a/_indicators/1-a-3.md b/_indicators/1-a-3.md
deleted file mode 100644
index e784df2f75a..00000000000
--- a/_indicators/1-a-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.a.3
-layout: indicator
-permalink: /1-a-3/
----
-
-
diff --git a/_indicators/1-b-1.md b/_indicators/1-b-1.md
deleted file mode 100644
index 393d15835c6..00000000000
--- a/_indicators/1-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 1.b.1
-layout: indicator
-permalink: /1-b-1/
----
-
-
diff --git a/_indicators/10-1-1.md b/_indicators/10-1-1.md
deleted file mode 100644
index 311a7d9d72d..00000000000
--- a/_indicators/10-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.1.1
-layout: indicator
-permalink: /10-1-1/
----
-
-
diff --git a/_indicators/10-2-1.md b/_indicators/10-2-1.md
deleted file mode 100644
index 896de911a81..00000000000
--- a/_indicators/10-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.2.1
-layout: indicator
-permalink: /10-2-1/
----
-
-
diff --git a/_indicators/10-3-1.md b/_indicators/10-3-1.md
deleted file mode 100644
index 2530bc42153..00000000000
--- a/_indicators/10-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.3.1
-layout: indicator
-permalink: /10-3-1/
----
-
-
diff --git a/_indicators/10-4-1.md b/_indicators/10-4-1.md
deleted file mode 100644
index 90c93ac6582..00000000000
--- a/_indicators/10-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.4.1
-layout: indicator
-permalink: /10-4-1/
----
-
-
diff --git a/_indicators/10-5-1.md b/_indicators/10-5-1.md
deleted file mode 100644
index 1a7edda7c93..00000000000
--- a/_indicators/10-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.5.1
-layout: indicator
-permalink: /10-5-1/
----
-
-
diff --git a/_indicators/10-6-1.md b/_indicators/10-6-1.md
deleted file mode 100644
index 289d09f1a26..00000000000
--- a/_indicators/10-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.6.1
-layout: indicator
-permalink: /10-6-1/
----
-
-
diff --git a/_indicators/10-7-1.md b/_indicators/10-7-1.md
deleted file mode 100644
index 9f6d31ec50b..00000000000
--- a/_indicators/10-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.7.1
-layout: indicator
-permalink: /10-7-1/
----
-
-
diff --git a/_indicators/10-7-2.md b/_indicators/10-7-2.md
deleted file mode 100644
index 82671ea21c7..00000000000
--- a/_indicators/10-7-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.7.2
-layout: indicator
-permalink: /10-7-2/
----
-
-
diff --git a/_indicators/10-a-1.md b/_indicators/10-a-1.md
deleted file mode 100644
index 650865df558..00000000000
--- a/_indicators/10-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.a.1
-layout: indicator
-permalink: /10-a-1/
----
-
-
diff --git a/_indicators/10-b-1.md b/_indicators/10-b-1.md
deleted file mode 100644
index bbb0f62b01f..00000000000
--- a/_indicators/10-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.b.1
-layout: indicator
-permalink: /10-b-1/
----
-
-
diff --git a/_indicators/10-c-1.md b/_indicators/10-c-1.md
deleted file mode 100644
index 6a04ac1b3b2..00000000000
--- a/_indicators/10-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 10.c.1
-layout: indicator
-permalink: /10-c-1/
----
-
-
diff --git a/_indicators/11-1-1.md b/_indicators/11-1-1.md
deleted file mode 100644
index 257ab47d832..00000000000
--- a/_indicators/11-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.1.1
-layout: indicator
-permalink: /11-1-1/
----
-
-
diff --git a/_indicators/11-2-1.md b/_indicators/11-2-1.md
deleted file mode 100644
index 2b505824fc4..00000000000
--- a/_indicators/11-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.2.1
-layout: indicator
-permalink: /11-2-1/
----
-
-
diff --git a/_indicators/11-3-1.md b/_indicators/11-3-1.md
deleted file mode 100644
index 147c509db51..00000000000
--- a/_indicators/11-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.3.1
-layout: indicator
-permalink: /11-3-1/
----
-
-
diff --git a/_indicators/11-3-2.md b/_indicators/11-3-2.md
deleted file mode 100644
index 2f3de2c0e1c..00000000000
--- a/_indicators/11-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.3.2
-layout: indicator
-permalink: /11-3-2/
----
-
-
diff --git a/_indicators/11-4-1.md b/_indicators/11-4-1.md
deleted file mode 100644
index e2163333e3a..00000000000
--- a/_indicators/11-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.4.1
-layout: indicator
-permalink: /11-4-1/
----
-
-
diff --git a/_indicators/11-5-1.md b/_indicators/11-5-1.md
deleted file mode 100644
index 11221067086..00000000000
--- a/_indicators/11-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.5.1
-layout: indicator
-permalink: /11-5-1/
----
-
-
diff --git a/_indicators/11-5-2.md b/_indicators/11-5-2.md
deleted file mode 100644
index 189e435dacf..00000000000
--- a/_indicators/11-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.5.2
-layout: indicator
-permalink: /11-5-2/
----
-
-
diff --git a/_indicators/11-6-1.md b/_indicators/11-6-1.md
deleted file mode 100644
index 851a9b67d12..00000000000
--- a/_indicators/11-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.6.1
-layout: indicator
-permalink: /11-6-1/
----
-
-
diff --git a/_indicators/11-6-2.md b/_indicators/11-6-2.md
deleted file mode 100644
index 87ff934bd16..00000000000
--- a/_indicators/11-6-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.6.2
-layout: indicator
-permalink: /11-6-2/
----
-
-
diff --git a/_indicators/11-7-1.md b/_indicators/11-7-1.md
deleted file mode 100644
index 91b18fbff09..00000000000
--- a/_indicators/11-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.7.1
-layout: indicator
-permalink: /11-7-1/
----
-
-
diff --git a/_indicators/11-7-2.md b/_indicators/11-7-2.md
deleted file mode 100644
index 818e01fe456..00000000000
--- a/_indicators/11-7-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.7.2
-layout: indicator
-permalink: /11-7-2/
----
-
-
diff --git a/_indicators/11-a-1.md b/_indicators/11-a-1.md
deleted file mode 100644
index 09c5f8cd096..00000000000
--- a/_indicators/11-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.a.1
-layout: indicator
-permalink: /11-a-1/
----
-
-
diff --git a/_indicators/11-b-1.md b/_indicators/11-b-1.md
deleted file mode 100644
index cf0d6af068a..00000000000
--- a/_indicators/11-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.b.1
-layout: indicator
-permalink: /11-b-1/
----
-
-
diff --git a/_indicators/11-b-2.md b/_indicators/11-b-2.md
deleted file mode 100644
index 6b96f125267..00000000000
--- a/_indicators/11-b-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.b.2
-layout: indicator
-permalink: /11-b-2/
----
-
-
diff --git a/_indicators/11-c-1.md b/_indicators/11-c-1.md
deleted file mode 100644
index f79d6f676ee..00000000000
--- a/_indicators/11-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 11.c.1
-layout: indicator
-permalink: /11-c-1/
----
-
-
diff --git a/_indicators/12-1-1.md b/_indicators/12-1-1.md
deleted file mode 100644
index f302e5bfdd7..00000000000
--- a/_indicators/12-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.1.1
-layout: indicator
-permalink: /12-1-1/
----
-
-
diff --git a/_indicators/12-2-1.md b/_indicators/12-2-1.md
deleted file mode 100644
index 445100d1321..00000000000
--- a/_indicators/12-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.2.1
-layout: indicator
-permalink: /12-2-1/
----
-
-
diff --git a/_indicators/12-2-2.md b/_indicators/12-2-2.md
deleted file mode 100644
index 5d45dadc106..00000000000
--- a/_indicators/12-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.2.2
-layout: indicator
-permalink: /12-2-2/
----
-
-
diff --git a/_indicators/12-3-1.md b/_indicators/12-3-1.md
deleted file mode 100644
index 1a215184907..00000000000
--- a/_indicators/12-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.3.1
-layout: indicator
-permalink: /12-3-1/
----
-
-
diff --git a/_indicators/12-4-1.md b/_indicators/12-4-1.md
deleted file mode 100644
index 1f79d2711a7..00000000000
--- a/_indicators/12-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.4.1
-layout: indicator
-permalink: /12-4-1/
----
-
-
diff --git a/_indicators/12-4-2.md b/_indicators/12-4-2.md
deleted file mode 100644
index 4138c9cd054..00000000000
--- a/_indicators/12-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.4.2
-layout: indicator
-permalink: /12-4-2/
----
-
-
diff --git a/_indicators/12-5-1.md b/_indicators/12-5-1.md
deleted file mode 100644
index 2a264f2a147..00000000000
--- a/_indicators/12-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.5.1
-layout: indicator
-permalink: /12-5-1/
----
-
-
diff --git a/_indicators/12-6-1.md b/_indicators/12-6-1.md
deleted file mode 100644
index 077e5304b07..00000000000
--- a/_indicators/12-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.6.1
-layout: indicator
-permalink: /12-6-1/
----
-
-
diff --git a/_indicators/12-7-1.md b/_indicators/12-7-1.md
deleted file mode 100644
index 916ece7dda4..00000000000
--- a/_indicators/12-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.7.1
-layout: indicator
-permalink: /12-7-1/
----
-
-
diff --git a/_indicators/12-8-1.md b/_indicators/12-8-1.md
deleted file mode 100644
index ea517c1fbf2..00000000000
--- a/_indicators/12-8-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.8.1
-layout: indicator
-permalink: /12-8-1/
----
-
-
diff --git a/_indicators/12-a-1.md b/_indicators/12-a-1.md
deleted file mode 100644
index 9aa922bbac8..00000000000
--- a/_indicators/12-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.a.1
-layout: indicator
-permalink: /12-a-1/
----
-
-
diff --git a/_indicators/12-b-1.md b/_indicators/12-b-1.md
deleted file mode 100644
index 12e659ceec5..00000000000
--- a/_indicators/12-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.b.1
-layout: indicator
-permalink: /12-b-1/
----
-
-
diff --git a/_indicators/12-c-1.md b/_indicators/12-c-1.md
deleted file mode 100644
index ffd1d6feffa..00000000000
--- a/_indicators/12-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 12.c.1
-layout: indicator
-permalink: /12-c-1/
----
-
-
diff --git a/_indicators/13-1-1.md b/_indicators/13-1-1.md
deleted file mode 100644
index a0d30ce81f9..00000000000
--- a/_indicators/13-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.1.1
-layout: indicator
-permalink: /13-1-1/
----
-
-
diff --git a/_indicators/13-1-2.md b/_indicators/13-1-2.md
deleted file mode 100644
index 10e58c5c120..00000000000
--- a/_indicators/13-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.1.2
-layout: indicator
-permalink: /13-1-2/
----
-
-
diff --git a/_indicators/13-1-3.md b/_indicators/13-1-3.md
deleted file mode 100644
index b465abcc31d..00000000000
--- a/_indicators/13-1-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.1.3
-layout: indicator
-permalink: /13-1-3/
----
-
-
diff --git a/_indicators/13-2-1.md b/_indicators/13-2-1.md
deleted file mode 100644
index 30303638ac3..00000000000
--- a/_indicators/13-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.2.1
-layout: indicator
-permalink: /13-2-1/
----
-
-
diff --git a/_indicators/13-3-1.md b/_indicators/13-3-1.md
deleted file mode 100644
index e2d7446e38b..00000000000
--- a/_indicators/13-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.3.1
-layout: indicator
-permalink: /13-3-1/
----
-
-
diff --git a/_indicators/13-3-2.md b/_indicators/13-3-2.md
deleted file mode 100644
index 526eb68bc84..00000000000
--- a/_indicators/13-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.3.2
-layout: indicator
-permalink: /13-3-2/
----
-
-
diff --git a/_indicators/13-a-1.md b/_indicators/13-a-1.md
deleted file mode 100644
index ab00d3845a6..00000000000
--- a/_indicators/13-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.a.1
-layout: indicator
-permalink: /13-a-1/
----
-
-
diff --git a/_indicators/13-b-1.md b/_indicators/13-b-1.md
deleted file mode 100644
index 8348811fad2..00000000000
--- a/_indicators/13-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 13.b.1
-layout: indicator
-permalink: /13-b-1/
----
-
-
diff --git a/_indicators/14-1-1.md b/_indicators/14-1-1.md
deleted file mode 100644
index af916600e17..00000000000
--- a/_indicators/14-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.1.1
-layout: indicator
-permalink: /14-1-1/
----
-
-
diff --git a/_indicators/14-2-1.md b/_indicators/14-2-1.md
deleted file mode 100644
index 49aa09a490c..00000000000
--- a/_indicators/14-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.2.1
-layout: indicator
-permalink: /14-2-1/
----
-
-
diff --git a/_indicators/14-3-1.md b/_indicators/14-3-1.md
deleted file mode 100644
index 05b5cdd5c2d..00000000000
--- a/_indicators/14-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.3.1
-layout: indicator
-permalink: /14-3-1/
----
-
-
diff --git a/_indicators/14-4-1.md b/_indicators/14-4-1.md
deleted file mode 100644
index 3a497fd70d7..00000000000
--- a/_indicators/14-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.4.1
-layout: indicator
-permalink: /14-4-1/
----
-
-
diff --git a/_indicators/14-5-1.md b/_indicators/14-5-1.md
deleted file mode 100644
index c134cbe775d..00000000000
--- a/_indicators/14-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.5.1
-layout: indicator
-permalink: /14-5-1/
----
-
-
diff --git a/_indicators/14-6-1.md b/_indicators/14-6-1.md
deleted file mode 100644
index b616f6f344f..00000000000
--- a/_indicators/14-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.6.1
-layout: indicator
-permalink: /14-6-1/
----
-
-
diff --git a/_indicators/14-7-1.md b/_indicators/14-7-1.md
deleted file mode 100644
index 4786fe659b8..00000000000
--- a/_indicators/14-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.7.1
-layout: indicator
-permalink: /14-7-1/
----
-
-
diff --git a/_indicators/14-a-1.md b/_indicators/14-a-1.md
deleted file mode 100644
index 7bdb3260bdb..00000000000
--- a/_indicators/14-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.a.1
-layout: indicator
-permalink: /14-a-1/
----
-
-
diff --git a/_indicators/14-b-1.md b/_indicators/14-b-1.md
deleted file mode 100644
index 5550fc9434e..00000000000
--- a/_indicators/14-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.b.1
-layout: indicator
-permalink: /14-b-1/
----
-
-
diff --git a/_indicators/14-c-1.md b/_indicators/14-c-1.md
deleted file mode 100644
index 58addde22d7..00000000000
--- a/_indicators/14-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 14.c.1
-layout: indicator
-permalink: /14-c-1/
----
-
-
diff --git a/_indicators/15-1-1.md b/_indicators/15-1-1.md
deleted file mode 100644
index e427b27954e..00000000000
--- a/_indicators/15-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.1.1
-layout: indicator
-permalink: /15-1-1/
----
-
-
diff --git a/_indicators/15-1-2.md b/_indicators/15-1-2.md
deleted file mode 100644
index 4f64dd92c67..00000000000
--- a/_indicators/15-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.1.2
-layout: indicator
-permalink: /15-1-2/
----
-
-
diff --git a/_indicators/15-2-1.md b/_indicators/15-2-1.md
deleted file mode 100644
index a79463e11aa..00000000000
--- a/_indicators/15-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.2.1
-layout: indicator
-permalink: /15-2-1/
----
-
-
diff --git a/_indicators/15-3-1.md b/_indicators/15-3-1.md
deleted file mode 100644
index 8751f7d596c..00000000000
--- a/_indicators/15-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.3.1
-layout: indicator
-permalink: /15-3-1/
----
-
-
diff --git a/_indicators/15-4-1.md b/_indicators/15-4-1.md
deleted file mode 100644
index 9b300891106..00000000000
--- a/_indicators/15-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.4.1
-layout: indicator
-permalink: /15-4-1/
----
-
-
diff --git a/_indicators/15-4-2.md b/_indicators/15-4-2.md
deleted file mode 100644
index 56b92c9ec5e..00000000000
--- a/_indicators/15-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.4.2
-layout: indicator
-permalink: /15-4-2/
----
-
-
diff --git a/_indicators/15-5-1.md b/_indicators/15-5-1.md
deleted file mode 100644
index 45f144618fa..00000000000
--- a/_indicators/15-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.5.1
-layout: indicator
-permalink: /15-5-1/
----
-
-
diff --git a/_indicators/15-6-1.md b/_indicators/15-6-1.md
deleted file mode 100644
index 95acdd48c32..00000000000
--- a/_indicators/15-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.6.1
-layout: indicator
-permalink: /15-6-1/
----
-
-
diff --git a/_indicators/15-7-1.md b/_indicators/15-7-1.md
deleted file mode 100644
index 6d3d55c1a61..00000000000
--- a/_indicators/15-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.7.1
-layout: indicator
-permalink: /15-7-1/
----
-
-
diff --git a/_indicators/15-8-1.md b/_indicators/15-8-1.md
deleted file mode 100644
index 1604c41e785..00000000000
--- a/_indicators/15-8-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.8.1
-layout: indicator
-permalink: /15-8-1/
----
-
-
diff --git a/_indicators/15-9-1.md b/_indicators/15-9-1.md
deleted file mode 100644
index 4a18808e302..00000000000
--- a/_indicators/15-9-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.9.1
-layout: indicator
-permalink: /15-9-1/
----
-
-
diff --git a/_indicators/15-a-1.md b/_indicators/15-a-1.md
deleted file mode 100644
index 618c0e2748c..00000000000
--- a/_indicators/15-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.a.1
-layout: indicator
-permalink: /15-a-1/
----
-
-
diff --git a/_indicators/15-b-1.md b/_indicators/15-b-1.md
deleted file mode 100644
index ca5fb2010ca..00000000000
--- a/_indicators/15-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.b.1
-layout: indicator
-permalink: /15-b-1/
----
-
-
diff --git a/_indicators/15-c-1.md b/_indicators/15-c-1.md
deleted file mode 100644
index 0cd197cec48..00000000000
--- a/_indicators/15-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 15.c.1
-layout: indicator
-permalink: /15-c-1/
----
-
-
diff --git a/_indicators/16-1-1.md b/_indicators/16-1-1.md
deleted file mode 100644
index 4e945d366c5..00000000000
--- a/_indicators/16-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.1.1
-layout: indicator
-permalink: /16-1-1/
----
-
-
diff --git a/_indicators/16-1-2.md b/_indicators/16-1-2.md
deleted file mode 100644
index 7f4f54a3773..00000000000
--- a/_indicators/16-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.1.2
-layout: indicator
-permalink: /16-1-2/
----
-
-
diff --git a/_indicators/16-1-3.md b/_indicators/16-1-3.md
deleted file mode 100644
index 118d4828d69..00000000000
--- a/_indicators/16-1-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.1.3
-layout: indicator
-permalink: /16-1-3/
----
-
-
diff --git a/_indicators/16-1-4.md b/_indicators/16-1-4.md
deleted file mode 100644
index 18932179973..00000000000
--- a/_indicators/16-1-4.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.1.4
-layout: indicator
-permalink: /16-1-4/
----
-
-
diff --git a/_indicators/16-10-1.md b/_indicators/16-10-1.md
deleted file mode 100644
index 6a0509ac1ff..00000000000
--- a/_indicators/16-10-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.10.1
-layout: indicator
-permalink: /16-10-1/
----
-
-
diff --git a/_indicators/16-10-2.md b/_indicators/16-10-2.md
deleted file mode 100644
index 8e9f18b8cb5..00000000000
--- a/_indicators/16-10-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.10.2
-layout: indicator
-permalink: /16-10-2/
----
-
-
diff --git a/_indicators/16-2-1.md b/_indicators/16-2-1.md
deleted file mode 100644
index 92b9f6f843e..00000000000
--- a/_indicators/16-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.2.1
-layout: indicator
-permalink: /16-2-1/
----
-
-
diff --git a/_indicators/16-2-2.md b/_indicators/16-2-2.md
deleted file mode 100644
index 7eec35195c5..00000000000
--- a/_indicators/16-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.2.2
-layout: indicator
-permalink: /16-2-2/
----
-
-
diff --git a/_indicators/16-2-3.md b/_indicators/16-2-3.md
deleted file mode 100644
index 2ad7d5ac5b1..00000000000
--- a/_indicators/16-2-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.2.3
-layout: indicator
-permalink: /16-2-3/
----
-
-
diff --git a/_indicators/16-3-1.md b/_indicators/16-3-1.md
deleted file mode 100644
index 8e1f79d3f5c..00000000000
--- a/_indicators/16-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.3.1
-layout: indicator
-permalink: /16-3-1/
----
-
-
diff --git a/_indicators/16-3-2.md b/_indicators/16-3-2.md
deleted file mode 100644
index 461767f6190..00000000000
--- a/_indicators/16-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.3.2
-layout: indicator
-permalink: /16-3-2/
----
-
-
diff --git a/_indicators/16-4-1.md b/_indicators/16-4-1.md
deleted file mode 100644
index 90aa96b26c9..00000000000
--- a/_indicators/16-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.4.1
-layout: indicator
-permalink: /16-4-1/
----
-
-
diff --git a/_indicators/16-4-2.md b/_indicators/16-4-2.md
deleted file mode 100644
index f074b038460..00000000000
--- a/_indicators/16-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.4.2
-layout: indicator
-permalink: /16-4-2/
----
-
-
diff --git a/_indicators/16-5-1.md b/_indicators/16-5-1.md
deleted file mode 100644
index 139ce1fd8c2..00000000000
--- a/_indicators/16-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.5.1
-layout: indicator
-permalink: /16-5-1/
----
-
-
diff --git a/_indicators/16-5-2.md b/_indicators/16-5-2.md
deleted file mode 100644
index e2a923a93b6..00000000000
--- a/_indicators/16-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.5.2
-layout: indicator
-permalink: /16-5-2/
----
-
-
diff --git a/_indicators/16-6-1.md b/_indicators/16-6-1.md
deleted file mode 100644
index 63a8dd0ca01..00000000000
--- a/_indicators/16-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.6.1
-layout: indicator
-permalink: /16-6-1/
----
-
-
diff --git a/_indicators/16-6-2.md b/_indicators/16-6-2.md
deleted file mode 100644
index 2a0c758d30a..00000000000
--- a/_indicators/16-6-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.6.2
-layout: indicator
-permalink: /16-6-2/
----
-
-
diff --git a/_indicators/16-7-1.md b/_indicators/16-7-1.md
deleted file mode 100644
index e425feed686..00000000000
--- a/_indicators/16-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.7.1
-layout: indicator
-permalink: /16-7-1/
----
-
-
diff --git a/_indicators/16-7-2.md b/_indicators/16-7-2.md
deleted file mode 100644
index 75403fc3dc1..00000000000
--- a/_indicators/16-7-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.7.2
-layout: indicator
-permalink: /16-7-2/
----
-
-
diff --git a/_indicators/16-8-1.md b/_indicators/16-8-1.md
deleted file mode 100644
index 567f1fb2bb8..00000000000
--- a/_indicators/16-8-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.8.1
-layout: indicator
-permalink: /16-8-1/
----
-
-
diff --git a/_indicators/16-9-1.md b/_indicators/16-9-1.md
deleted file mode 100644
index a4c2f232afa..00000000000
--- a/_indicators/16-9-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.9.1
-layout: indicator
-permalink: /16-9-1/
----
-
-
diff --git a/_indicators/16-a-1.md b/_indicators/16-a-1.md
deleted file mode 100644
index b33417a4678..00000000000
--- a/_indicators/16-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.a.1
-layout: indicator
-permalink: /16-a-1/
----
-
-
diff --git a/_indicators/16-b-1.md b/_indicators/16-b-1.md
deleted file mode 100644
index b855de95955..00000000000
--- a/_indicators/16-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 16.b.1
-layout: indicator
-permalink: /16-b-1/
----
-
-
diff --git a/_indicators/17-1-1.md b/_indicators/17-1-1.md
deleted file mode 100644
index bdf13f427d5..00000000000
--- a/_indicators/17-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.1.1
-layout: indicator
-permalink: /17-1-1/
----
-
-
diff --git a/_indicators/17-1-2.md b/_indicators/17-1-2.md
deleted file mode 100644
index 3e65c265266..00000000000
--- a/_indicators/17-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.1.2
-layout: indicator
-permalink: /17-1-2/
----
-
-
diff --git a/_indicators/17-10-1.md b/_indicators/17-10-1.md
deleted file mode 100644
index 0d9ca6bc6db..00000000000
--- a/_indicators/17-10-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.10.1
-layout: indicator
-permalink: /17-10-1/
----
-
-
diff --git a/_indicators/17-11-1.md b/_indicators/17-11-1.md
deleted file mode 100644
index 0d765fe4818..00000000000
--- a/_indicators/17-11-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.11.1
-layout: indicator
-permalink: /17-11-1/
----
-
-
diff --git a/_indicators/17-12-1.md b/_indicators/17-12-1.md
deleted file mode 100644
index 97577e5b42a..00000000000
--- a/_indicators/17-12-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.12.1
-layout: indicator
-permalink: /17-12-1/
----
-
-
diff --git a/_indicators/17-13-1.md b/_indicators/17-13-1.md
deleted file mode 100644
index 910010ae217..00000000000
--- a/_indicators/17-13-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.13.1
-layout: indicator
-permalink: /17-13-1/
----
-
-
diff --git a/_indicators/17-14-1.md b/_indicators/17-14-1.md
deleted file mode 100644
index 8e668f9dce2..00000000000
--- a/_indicators/17-14-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.14.1
-layout: indicator
-permalink: /17-14-1/
----
-
-
diff --git a/_indicators/17-15-1.md b/_indicators/17-15-1.md
deleted file mode 100644
index 9297f5c4c78..00000000000
--- a/_indicators/17-15-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.15.1
-layout: indicator
-permalink: /17-15-1/
----
-
-
diff --git a/_indicators/17-16-1.md b/_indicators/17-16-1.md
deleted file mode 100644
index 509bad2b595..00000000000
--- a/_indicators/17-16-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.16.1
-layout: indicator
-permalink: /17-16-1/
----
-
-
diff --git a/_indicators/17-17-1.md b/_indicators/17-17-1.md
deleted file mode 100644
index 322be5afdf8..00000000000
--- a/_indicators/17-17-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.17.1
-layout: indicator
-permalink: /17-17-1/
----
-
-
diff --git a/_indicators/17-18-1.md b/_indicators/17-18-1.md
deleted file mode 100644
index b2536dd0dae..00000000000
--- a/_indicators/17-18-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.18.1
-layout: indicator
-permalink: /17-18-1/
----
-
-
diff --git a/_indicators/17-18-2.md b/_indicators/17-18-2.md
deleted file mode 100644
index 35537545c67..00000000000
--- a/_indicators/17-18-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.18.2
-layout: indicator
-permalink: /17-18-2/
----
-
-
diff --git a/_indicators/17-18-3.md b/_indicators/17-18-3.md
deleted file mode 100644
index d4eaccd5856..00000000000
--- a/_indicators/17-18-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.18.3
-layout: indicator
-permalink: /17-18-3/
----
-
-
diff --git a/_indicators/17-19-1.md b/_indicators/17-19-1.md
deleted file mode 100644
index 715c114cc4b..00000000000
--- a/_indicators/17-19-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.19.1
-layout: indicator
-permalink: /17-19-1/
----
-
-
diff --git a/_indicators/17-19-2.md b/_indicators/17-19-2.md
deleted file mode 100644
index 8abb5d2971c..00000000000
--- a/_indicators/17-19-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.19.2
-layout: indicator
-permalink: /17-19-2/
----
-
-
diff --git a/_indicators/17-2-1.md b/_indicators/17-2-1.md
deleted file mode 100644
index b8d8bd1f343..00000000000
--- a/_indicators/17-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.2.1
-layout: indicator
-permalink: /17-2-1/
----
-
-
diff --git a/_indicators/17-3-1.md b/_indicators/17-3-1.md
deleted file mode 100644
index 71f9c95b176..00000000000
--- a/_indicators/17-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.3.1
-layout: indicator
-permalink: /17-3-1/
----
-
-
diff --git a/_indicators/17-3-2.md b/_indicators/17-3-2.md
deleted file mode 100644
index 3d1f090cfbe..00000000000
--- a/_indicators/17-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.3.2
-layout: indicator
-permalink: /17-3-2/
----
-
-
diff --git a/_indicators/17-4-1.md b/_indicators/17-4-1.md
deleted file mode 100644
index acae665d9e9..00000000000
--- a/_indicators/17-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.4.1
-layout: indicator
-permalink: /17-4-1/
----
-
-
diff --git a/_indicators/17-5-1.md b/_indicators/17-5-1.md
deleted file mode 100644
index 0f16df259a4..00000000000
--- a/_indicators/17-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.5.1
-layout: indicator
-permalink: /17-5-1/
----
-
-
diff --git a/_indicators/17-6-1.md b/_indicators/17-6-1.md
deleted file mode 100644
index 38df7719196..00000000000
--- a/_indicators/17-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.6.1
-layout: indicator
-permalink: /17-6-1/
----
-
-
diff --git a/_indicators/17-6-2.md b/_indicators/17-6-2.md
deleted file mode 100644
index 7380f830ce3..00000000000
--- a/_indicators/17-6-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.6.2
-layout: indicator
-permalink: /17-6-2/
----
-
-
diff --git a/_indicators/17-7-1.md b/_indicators/17-7-1.md
deleted file mode 100644
index 1999a498228..00000000000
--- a/_indicators/17-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.7.1
-layout: indicator
-permalink: /17-7-1/
----
-
-
diff --git a/_indicators/17-8-1.md b/_indicators/17-8-1.md
deleted file mode 100644
index f35a4e567b1..00000000000
--- a/_indicators/17-8-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.8.1
-layout: indicator
-permalink: /17-8-1/
----
-
-
diff --git a/_indicators/17-9-1.md b/_indicators/17-9-1.md
deleted file mode 100644
index 7215193064d..00000000000
--- a/_indicators/17-9-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 17.9.1
-layout: indicator
-permalink: /17-9-1/
----
-
-
diff --git a/_indicators/2-1-1.md b/_indicators/2-1-1.md
deleted file mode 100644
index 1f0a46b0505..00000000000
--- a/_indicators/2-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.1.1
-layout: indicator
-permalink: /2-1-1/
----
-
-
diff --git a/_indicators/2-1-2.md b/_indicators/2-1-2.md
deleted file mode 100644
index 7d8a51f09ba..00000000000
--- a/_indicators/2-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.1.2
-layout: indicator
-permalink: /2-1-2/
----
-
-
diff --git a/_indicators/2-2-1.md b/_indicators/2-2-1.md
deleted file mode 100644
index c06196efd52..00000000000
--- a/_indicators/2-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.2.1
-layout: indicator
-permalink: /2-2-1/
----
-
-
diff --git a/_indicators/2-2-2.md b/_indicators/2-2-2.md
deleted file mode 100644
index c5f4fb0b2d4..00000000000
--- a/_indicators/2-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.2.2
-layout: indicator
-permalink: /2-2-2/
----
-
-
diff --git a/_indicators/2-3-1.md b/_indicators/2-3-1.md
deleted file mode 100644
index 7339bbe077b..00000000000
--- a/_indicators/2-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.3.1
-layout: indicator
-permalink: /2-3-1/
----
-
-
diff --git a/_indicators/2-3-2.md b/_indicators/2-3-2.md
deleted file mode 100644
index 0d54d891690..00000000000
--- a/_indicators/2-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.3.2
-layout: indicator
-permalink: /2-3-2/
----
-
-
diff --git a/_indicators/2-4-1.md b/_indicators/2-4-1.md
deleted file mode 100644
index 71136354ede..00000000000
--- a/_indicators/2-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.4.1
-layout: indicator
-permalink: /2-4-1/
----
-
-
diff --git a/_indicators/2-5-1.md b/_indicators/2-5-1.md
deleted file mode 100644
index 47ea4ce2b99..00000000000
--- a/_indicators/2-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.5.1
-layout: indicator
-permalink: /2-5-1/
----
-
-
diff --git a/_indicators/2-5-2.md b/_indicators/2-5-2.md
deleted file mode 100644
index 597d2f40237..00000000000
--- a/_indicators/2-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.5.2
-layout: indicator
-permalink: /2-5-2/
----
-
-
diff --git a/_indicators/2-a-1.md b/_indicators/2-a-1.md
deleted file mode 100644
index 8ed6e6be137..00000000000
--- a/_indicators/2-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.a.1
-layout: indicator
-permalink: /2-a-1/
----
-
-
diff --git a/_indicators/2-a-2.md b/_indicators/2-a-2.md
deleted file mode 100644
index 253bd29177d..00000000000
--- a/_indicators/2-a-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.a.2
-layout: indicator
-permalink: /2-a-2/
----
-
-
diff --git a/_indicators/2-b-1.md b/_indicators/2-b-1.md
deleted file mode 100644
index 259556917f8..00000000000
--- a/_indicators/2-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.b.1
-layout: indicator
-permalink: /2-b-1/
----
-
-
diff --git a/_indicators/2-c-1.md b/_indicators/2-c-1.md
deleted file mode 100644
index 160fe6ff59a..00000000000
--- a/_indicators/2-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 2.c.1
-layout: indicator
-permalink: /2-c-1/
----
-
-
diff --git a/_indicators/3-1-1.md b/_indicators/3-1-1.md
deleted file mode 100644
index 75637dab5aa..00000000000
--- a/_indicators/3-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.1.1
-layout: indicator
-permalink: /3-1-1/
----
-
-
diff --git a/_indicators/3-1-2.md b/_indicators/3-1-2.md
deleted file mode 100644
index 517adebca88..00000000000
--- a/_indicators/3-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.1.2
-layout: indicator
-permalink: /3-1-2/
----
-
-
diff --git a/_indicators/3-2-1.md b/_indicators/3-2-1.md
deleted file mode 100644
index e5da1aafd7a..00000000000
--- a/_indicators/3-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.2.1
-layout: indicator
-permalink: /3-2-1/
----
-
-
diff --git a/_indicators/3-2-2.md b/_indicators/3-2-2.md
deleted file mode 100644
index 773582a98be..00000000000
--- a/_indicators/3-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.2.2
-layout: indicator
-permalink: /3-2-2/
----
-
-
diff --git a/_indicators/3-3-1.md b/_indicators/3-3-1.md
deleted file mode 100644
index 38cbfe75123..00000000000
--- a/_indicators/3-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.3.1
-layout: indicator
-permalink: /3-3-1/
----
-
-
diff --git a/_indicators/3-3-2.md b/_indicators/3-3-2.md
deleted file mode 100644
index c31974712b0..00000000000
--- a/_indicators/3-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.3.2
-layout: indicator
-permalink: /3-3-2/
----
-
-
diff --git a/_indicators/3-3-3.md b/_indicators/3-3-3.md
deleted file mode 100644
index 22e389dd940..00000000000
--- a/_indicators/3-3-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.3.3
-layout: indicator
-permalink: /3-3-3/
----
-
-
diff --git a/_indicators/3-3-4.md b/_indicators/3-3-4.md
deleted file mode 100644
index a2d665d4154..00000000000
--- a/_indicators/3-3-4.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.3.4
-layout: indicator
-permalink: /3-3-4/
----
-
-
diff --git a/_indicators/3-3-5.md b/_indicators/3-3-5.md
deleted file mode 100644
index 48dd5eba356..00000000000
--- a/_indicators/3-3-5.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.3.5
-layout: indicator
-permalink: /3-3-5/
----
-
-
diff --git a/_indicators/3-4-1.md b/_indicators/3-4-1.md
deleted file mode 100644
index 0148f09f416..00000000000
--- a/_indicators/3-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.4.1
-layout: indicator
-permalink: /3-4-1/
----
-
-
diff --git a/_indicators/3-4-2.md b/_indicators/3-4-2.md
deleted file mode 100644
index fa4c4b34b1f..00000000000
--- a/_indicators/3-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.4.2
-layout: indicator
-permalink: /3-4-2/
----
-
-
diff --git a/_indicators/3-5-1.md b/_indicators/3-5-1.md
deleted file mode 100644
index 196cc4651f4..00000000000
--- a/_indicators/3-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.5.1
-layout: indicator
-permalink: /3-5-1/
----
-
-
diff --git a/_indicators/3-5-2.md b/_indicators/3-5-2.md
deleted file mode 100644
index 68ff4fa4936..00000000000
--- a/_indicators/3-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.5.2
-layout: indicator
-permalink: /3-5-2/
----
-
-
diff --git a/_indicators/3-6-1.md b/_indicators/3-6-1.md
deleted file mode 100644
index 9cfe9146d5a..00000000000
--- a/_indicators/3-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.6.1
-layout: indicator
-permalink: /3-6-1/
----
-
-
diff --git a/_indicators/3-7-1.md b/_indicators/3-7-1.md
deleted file mode 100644
index 1d4147b445f..00000000000
--- a/_indicators/3-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.7.1
-layout: indicator
-permalink: /3-7-1/
----
-
-
diff --git a/_indicators/3-7-2.md b/_indicators/3-7-2.md
deleted file mode 100644
index 42a3a9e1fde..00000000000
--- a/_indicators/3-7-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.7.2
-layout: indicator
-permalink: /3-7-2/
----
-
-
diff --git a/_indicators/3-8-1.md b/_indicators/3-8-1.md
deleted file mode 100644
index a34e4dfb794..00000000000
--- a/_indicators/3-8-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.8.1
-layout: indicator
-permalink: /3-8-1/
----
-
-
diff --git a/_indicators/3-8-2.md b/_indicators/3-8-2.md
deleted file mode 100644
index 8c0613718f4..00000000000
--- a/_indicators/3-8-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.8.2
-layout: indicator
-permalink: /3-8-2/
----
-
-
diff --git a/_indicators/3-9-1.md b/_indicators/3-9-1.md
deleted file mode 100644
index 80cde3340b4..00000000000
--- a/_indicators/3-9-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.9.1
-layout: indicator
-permalink: /3-9-1/
----
-
-
diff --git a/_indicators/3-9-2.md b/_indicators/3-9-2.md
deleted file mode 100644
index d8f196a69ec..00000000000
--- a/_indicators/3-9-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.9.2
-layout: indicator
-permalink: /3-9-2/
----
-
-
diff --git a/_indicators/3-9-3.md b/_indicators/3-9-3.md
deleted file mode 100644
index e4b4e30973e..00000000000
--- a/_indicators/3-9-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.9.3
-layout: indicator
-permalink: /3-9-3/
----
-
-
diff --git a/_indicators/3-a-1.md b/_indicators/3-a-1.md
deleted file mode 100644
index 620ed5992d0..00000000000
--- a/_indicators/3-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.a.1
-layout: indicator
-permalink: /3-a-1/
----
-
-
diff --git a/_indicators/3-b-1.md b/_indicators/3-b-1.md
deleted file mode 100644
index 2dfb30897e0..00000000000
--- a/_indicators/3-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.b.1
-layout: indicator
-permalink: /3-b-1/
----
-
-
diff --git a/_indicators/3-b-2.md b/_indicators/3-b-2.md
deleted file mode 100644
index 2e31d3478a3..00000000000
--- a/_indicators/3-b-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.b.2
-layout: indicator
-permalink: /3-b-2/
----
-
-
diff --git a/_indicators/3-b-3.md b/_indicators/3-b-3.md
deleted file mode 100644
index 7e2805ba5fc..00000000000
--- a/_indicators/3-b-3.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.b.3
-layout: indicator
-permalink: /3-b-3/
----
-
-
diff --git a/_indicators/3-c-1.md b/_indicators/3-c-1.md
deleted file mode 100644
index bdeb50e6264..00000000000
--- a/_indicators/3-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.c.1
-layout: indicator
-permalink: /3-c-1/
----
-
-
diff --git a/_indicators/3-d-1.md b/_indicators/3-d-1.md
deleted file mode 100644
index 2735d9e1f86..00000000000
--- a/_indicators/3-d-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 3.d.1
-layout: indicator
-permalink: /3-d-1/
----
-
-
diff --git a/_indicators/4-1-1.md b/_indicators/4-1-1.md
deleted file mode 100644
index 48f9474fb05..00000000000
--- a/_indicators/4-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.1.1
-layout: indicator
-permalink: /4-1-1/
----
-
-
diff --git a/_indicators/4-2-1.md b/_indicators/4-2-1.md
deleted file mode 100644
index aff2e4d1d86..00000000000
--- a/_indicators/4-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.2.1
-layout: indicator
-permalink: /4-2-1/
----
-
-
diff --git a/_indicators/4-2-2.md b/_indicators/4-2-2.md
deleted file mode 100644
index 5b2640b2647..00000000000
--- a/_indicators/4-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.2.2
-layout: indicator
-permalink: /4-2-2/
----
-
-
diff --git a/_indicators/4-3-1.md b/_indicators/4-3-1.md
deleted file mode 100644
index 6a2dd3812c2..00000000000
--- a/_indicators/4-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.3.1
-layout: indicator
-permalink: /4-3-1/
----
-
-
diff --git a/_indicators/4-4-1.md b/_indicators/4-4-1.md
deleted file mode 100644
index d36ed983ea0..00000000000
--- a/_indicators/4-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.4.1
-layout: indicator
-permalink: /4-4-1/
----
-
-
diff --git a/_indicators/4-5-1.md b/_indicators/4-5-1.md
deleted file mode 100644
index 13e555f3963..00000000000
--- a/_indicators/4-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.5.1
-layout: indicator
-permalink: /4-5-1/
----
-
-
diff --git a/_indicators/4-6-1.md b/_indicators/4-6-1.md
deleted file mode 100644
index 9362e2bca96..00000000000
--- a/_indicators/4-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.6.1
-layout: indicator
-permalink: /4-6-1/
----
-
-
diff --git a/_indicators/4-7-1.md b/_indicators/4-7-1.md
deleted file mode 100644
index 5e4ca9f264e..00000000000
--- a/_indicators/4-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.7.1
-layout: indicator
-permalink: /4-7-1/
----
-
-
diff --git a/_indicators/4-a-1.md b/_indicators/4-a-1.md
deleted file mode 100644
index 4f905488c32..00000000000
--- a/_indicators/4-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.a.1
-layout: indicator
-permalink: /4-a-1/
----
-
-
diff --git a/_indicators/4-b-1.md b/_indicators/4-b-1.md
deleted file mode 100644
index 26900f154d7..00000000000
--- a/_indicators/4-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.b.1
-layout: indicator
-permalink: /4-b-1/
----
-
-
diff --git a/_indicators/4-c-1.md b/_indicators/4-c-1.md
deleted file mode 100644
index d98be7d0791..00000000000
--- a/_indicators/4-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 4.c.1
-layout: indicator
-permalink: /4-c-1/
----
-
-
diff --git a/_indicators/5-1-1.md b/_indicators/5-1-1.md
deleted file mode 100644
index 3a446994825..00000000000
--- a/_indicators/5-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.1.1
-layout: indicator
-permalink: /5-1-1/
----
-
-
diff --git a/_indicators/5-2-1.md b/_indicators/5-2-1.md
deleted file mode 100644
index 07349e71e20..00000000000
--- a/_indicators/5-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.2.1
-layout: indicator
-permalink: /5-2-1/
----
-
-
diff --git a/_indicators/5-2-2.md b/_indicators/5-2-2.md
deleted file mode 100644
index 03e769b78c1..00000000000
--- a/_indicators/5-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.2.2
-layout: indicator
-permalink: /5-2-2/
----
-
-
diff --git a/_indicators/5-3-1.md b/_indicators/5-3-1.md
deleted file mode 100644
index 750f8b8ba28..00000000000
--- a/_indicators/5-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.3.1
-layout: indicator
-permalink: /5-3-1/
----
-
-
diff --git a/_indicators/5-3-2.md b/_indicators/5-3-2.md
deleted file mode 100644
index 662785bf697..00000000000
--- a/_indicators/5-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.3.2
-layout: indicator
-permalink: /5-3-2/
----
-
-
diff --git a/_indicators/5-4-1.md b/_indicators/5-4-1.md
deleted file mode 100644
index 7268fb53195..00000000000
--- a/_indicators/5-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.4.1
-layout: indicator
-permalink: /5-4-1/
----
-
-
diff --git a/_indicators/5-5-1.md b/_indicators/5-5-1.md
deleted file mode 100644
index ebae1bd396a..00000000000
--- a/_indicators/5-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.5.1
-layout: indicator
-permalink: /5-5-1/
----
-
-
diff --git a/_indicators/5-5-2.md b/_indicators/5-5-2.md
deleted file mode 100644
index 251d67c21ee..00000000000
--- a/_indicators/5-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.5.2
-layout: indicator
-permalink: /5-5-2/
----
-
-
diff --git a/_indicators/5-6-1.md b/_indicators/5-6-1.md
deleted file mode 100644
index c73a78485e9..00000000000
--- a/_indicators/5-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.6.1
-layout: indicator
-permalink: /5-6-1/
----
-
-
diff --git a/_indicators/5-6-2.md b/_indicators/5-6-2.md
deleted file mode 100644
index d4b64d5d366..00000000000
--- a/_indicators/5-6-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.6.2
-layout: indicator
-permalink: /5-6-2/
----
-
-
diff --git a/_indicators/5-a-1.md b/_indicators/5-a-1.md
deleted file mode 100644
index 3467658b86b..00000000000
--- a/_indicators/5-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.a.1
-layout: indicator
-permalink: /5-a-1/
----
-
-
diff --git a/_indicators/5-a-2.md b/_indicators/5-a-2.md
deleted file mode 100644
index c59420b77b9..00000000000
--- a/_indicators/5-a-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.a.2
-layout: indicator
-permalink: /5-a-2/
----
-
-
diff --git a/_indicators/5-b-1.md b/_indicators/5-b-1.md
deleted file mode 100644
index 05ecb1bc91a..00000000000
--- a/_indicators/5-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.b.1
-layout: indicator
-permalink: /5-b-1/
----
-
-
diff --git a/_indicators/5-c-1.md b/_indicators/5-c-1.md
deleted file mode 100644
index b2a313af556..00000000000
--- a/_indicators/5-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 5.c.1
-layout: indicator
-permalink: /5-c-1/
----
-
-
diff --git a/_indicators/6-1-1.md b/_indicators/6-1-1.md
deleted file mode 100644
index 23e39623394..00000000000
--- a/_indicators/6-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.1.1
-layout: indicator
-permalink: /6-1-1/
----
-
-
diff --git a/_indicators/6-2-1.md b/_indicators/6-2-1.md
deleted file mode 100644
index 71c147de96a..00000000000
--- a/_indicators/6-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.2.1
-layout: indicator
-permalink: /6-2-1/
----
-
-
diff --git a/_indicators/6-3-1.md b/_indicators/6-3-1.md
deleted file mode 100644
index 1a0c8eb9205..00000000000
--- a/_indicators/6-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.3.1
-layout: indicator
-permalink: /6-3-1/
----
-
-
diff --git a/_indicators/6-3-2.md b/_indicators/6-3-2.md
deleted file mode 100644
index 76aefdd4a46..00000000000
--- a/_indicators/6-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.3.2
-layout: indicator
-permalink: /6-3-2/
----
-
-
diff --git a/_indicators/6-4-1.md b/_indicators/6-4-1.md
deleted file mode 100644
index 70efb9836ea..00000000000
--- a/_indicators/6-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.4.1
-layout: indicator
-permalink: /6-4-1/
----
-
-
diff --git a/_indicators/6-4-2.md b/_indicators/6-4-2.md
deleted file mode 100644
index f067026ddd5..00000000000
--- a/_indicators/6-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.4.2
-layout: indicator
-permalink: /6-4-2/
----
-
-
diff --git a/_indicators/6-5-1.md b/_indicators/6-5-1.md
deleted file mode 100644
index 9eea4870eb8..00000000000
--- a/_indicators/6-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.5.1
-layout: indicator
-permalink: /6-5-1/
----
-
-
diff --git a/_indicators/6-5-2.md b/_indicators/6-5-2.md
deleted file mode 100644
index 7d1bb245a73..00000000000
--- a/_indicators/6-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.5.2
-layout: indicator
-permalink: /6-5-2/
----
-
-
diff --git a/_indicators/6-6-1.md b/_indicators/6-6-1.md
deleted file mode 100644
index abf9de4bb7a..00000000000
--- a/_indicators/6-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.6.1
-layout: indicator
-permalink: /6-6-1/
----
-
-
diff --git a/_indicators/6-a-1.md b/_indicators/6-a-1.md
deleted file mode 100644
index 427173b4e08..00000000000
--- a/_indicators/6-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.a.1
-layout: indicator
-permalink: /6-a-1/
----
-
-
diff --git a/_indicators/6-b-1.md b/_indicators/6-b-1.md
deleted file mode 100644
index 3d638f4c728..00000000000
--- a/_indicators/6-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 6.b.1
-layout: indicator
-permalink: /6-b-1/
----
-
-
diff --git a/_indicators/7-1-1.md b/_indicators/7-1-1.md
deleted file mode 100644
index db249f887a0..00000000000
--- a/_indicators/7-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 7.1.1
-layout: indicator
-permalink: /7-1-1/
----
-
-
diff --git a/_indicators/7-1-2.md b/_indicators/7-1-2.md
deleted file mode 100644
index 8cb29cdbed5..00000000000
--- a/_indicators/7-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 7.1.2
-layout: indicator
-permalink: /7-1-2/
----
-
-
diff --git a/_indicators/7-2-1.md b/_indicators/7-2-1.md
deleted file mode 100644
index a2196061d16..00000000000
--- a/_indicators/7-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 7.2.1
-layout: indicator
-permalink: /7-2-1/
----
-
-
diff --git a/_indicators/7-3-1.md b/_indicators/7-3-1.md
deleted file mode 100644
index 9ce8c303569..00000000000
--- a/_indicators/7-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 7.3.1
-layout: indicator
-permalink: /7-3-1/
----
-
-
diff --git a/_indicators/7-a-1.md b/_indicators/7-a-1.md
deleted file mode 100644
index e3ccd590044..00000000000
--- a/_indicators/7-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 7.a.1
-layout: indicator
-permalink: /7-a-1/
----
-
-
diff --git a/_indicators/7-b-1.md b/_indicators/7-b-1.md
deleted file mode 100644
index 04d85772b8b..00000000000
--- a/_indicators/7-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 7.b.1
-layout: indicator
-permalink: /7-b-1/
----
-
-
diff --git a/_indicators/8-1-1.md b/_indicators/8-1-1.md
deleted file mode 100644
index 9b945ab7355..00000000000
--- a/_indicators/8-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.1.1
-layout: indicator
-permalink: /8-1-1/
----
-
-
diff --git a/_indicators/8-10-1.md b/_indicators/8-10-1.md
deleted file mode 100644
index 58bc0c1c1eb..00000000000
--- a/_indicators/8-10-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.10.1
-layout: indicator
-permalink: /8-10-1/
----
-
-
diff --git a/_indicators/8-10-2.md b/_indicators/8-10-2.md
deleted file mode 100644
index 7f60d1ea7ae..00000000000
--- a/_indicators/8-10-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.10.2
-layout: indicator
-permalink: /8-10-2/
----
-
-
diff --git a/_indicators/8-2-1.md b/_indicators/8-2-1.md
deleted file mode 100644
index 23eefc4ce95..00000000000
--- a/_indicators/8-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.2.1
-layout: indicator
-permalink: /8-2-1/
----
-
-
diff --git a/_indicators/8-3-1.md b/_indicators/8-3-1.md
deleted file mode 100644
index e7c589674a6..00000000000
--- a/_indicators/8-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.3.1
-layout: indicator
-permalink: /8-3-1/
----
-
-
diff --git a/_indicators/8-4-1.md b/_indicators/8-4-1.md
deleted file mode 100644
index 6e0c4401695..00000000000
--- a/_indicators/8-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.4.1
-layout: indicator
-permalink: /8-4-1/
----
-
-
diff --git a/_indicators/8-4-2.md b/_indicators/8-4-2.md
deleted file mode 100644
index 92f0ea4fcc8..00000000000
--- a/_indicators/8-4-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.4.2
-layout: indicator
-permalink: /8-4-2/
----
-
-
diff --git a/_indicators/8-5-1.md b/_indicators/8-5-1.md
deleted file mode 100644
index 6b3531997f9..00000000000
--- a/_indicators/8-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.5.1
-layout: indicator
-permalink: /8-5-1/
----
-
-
diff --git a/_indicators/8-5-2.md b/_indicators/8-5-2.md
deleted file mode 100644
index 91cb4df31ae..00000000000
--- a/_indicators/8-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.5.2
-layout: indicator
-permalink: /8-5-2/
----
-
-
diff --git a/_indicators/8-6-1.md b/_indicators/8-6-1.md
deleted file mode 100644
index 158666be806..00000000000
--- a/_indicators/8-6-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.6.1
-layout: indicator
-permalink: /8-6-1/
----
-
-
diff --git a/_indicators/8-7-1.md b/_indicators/8-7-1.md
deleted file mode 100644
index da11f27dcc7..00000000000
--- a/_indicators/8-7-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.7.1
-layout: indicator
-permalink: /8-7-1/
----
-
-
diff --git a/_indicators/8-8-1.md b/_indicators/8-8-1.md
deleted file mode 100644
index 9e425c50ff5..00000000000
--- a/_indicators/8-8-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.8.1
-layout: indicator
-permalink: /8-8-1/
----
-
-
diff --git a/_indicators/8-8-2.md b/_indicators/8-8-2.md
deleted file mode 100644
index 988c8721a2a..00000000000
--- a/_indicators/8-8-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.8.2
-layout: indicator
-permalink: /8-8-2/
----
-
-
diff --git a/_indicators/8-9-1.md b/_indicators/8-9-1.md
deleted file mode 100644
index 5822b7685dc..00000000000
--- a/_indicators/8-9-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.9.1
-layout: indicator
-permalink: /8-9-1/
----
-
-
diff --git a/_indicators/8-9-2.md b/_indicators/8-9-2.md
deleted file mode 100644
index 1ef2e5fa9bd..00000000000
--- a/_indicators/8-9-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.9.2
-layout: indicator
-permalink: /8-9-2/
----
-
-
diff --git a/_indicators/8-a-1.md b/_indicators/8-a-1.md
deleted file mode 100644
index c84e7aaf748..00000000000
--- a/_indicators/8-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.a.1
-layout: indicator
-permalink: /8-a-1/
----
-
-
diff --git a/_indicators/8-b-1.md b/_indicators/8-b-1.md
deleted file mode 100644
index 76dce3f9982..00000000000
--- a/_indicators/8-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 8.b.1
-layout: indicator
-permalink: /8-b-1/
----
-
-
diff --git a/_indicators/9-1-1.md b/_indicators/9-1-1.md
deleted file mode 100644
index 17d7af0f92b..00000000000
--- a/_indicators/9-1-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.1.1
-layout: indicator
-permalink: /9-1-1/
----
-
-
diff --git a/_indicators/9-1-2.md b/_indicators/9-1-2.md
deleted file mode 100644
index 76abdc6d858..00000000000
--- a/_indicators/9-1-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.1.2
-layout: indicator
-permalink: /9-1-2/
----
-
-
diff --git a/_indicators/9-2-1.md b/_indicators/9-2-1.md
deleted file mode 100644
index 3eda776867d..00000000000
--- a/_indicators/9-2-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.2.1
-layout: indicator
-permalink: /9-2-1/
----
-
-
diff --git a/_indicators/9-2-2.md b/_indicators/9-2-2.md
deleted file mode 100644
index 79442b59a59..00000000000
--- a/_indicators/9-2-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.2.2
-layout: indicator
-permalink: /9-2-2/
----
-
-
diff --git a/_indicators/9-3-1.md b/_indicators/9-3-1.md
deleted file mode 100644
index e42357da32e..00000000000
--- a/_indicators/9-3-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.3.1
-layout: indicator
-permalink: /9-3-1/
----
-
-
diff --git a/_indicators/9-3-2.md b/_indicators/9-3-2.md
deleted file mode 100644
index d8f15407c15..00000000000
--- a/_indicators/9-3-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.3.2
-layout: indicator
-permalink: /9-3-2/
----
-
-
diff --git a/_indicators/9-4-1.md b/_indicators/9-4-1.md
deleted file mode 100644
index becf636b8c4..00000000000
--- a/_indicators/9-4-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.4.1
-layout: indicator
-permalink: /9-4-1/
----
-
-
diff --git a/_indicators/9-5-1.md b/_indicators/9-5-1.md
deleted file mode 100644
index 8e45c6b071c..00000000000
--- a/_indicators/9-5-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.5.1
-layout: indicator
-permalink: /9-5-1/
----
-
-
diff --git a/_indicators/9-5-2.md b/_indicators/9-5-2.md
deleted file mode 100644
index a0a2ffe9c54..00000000000
--- a/_indicators/9-5-2.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.5.2
-layout: indicator
-permalink: /9-5-2/
----
-
-
diff --git a/_indicators/9-a-1.md b/_indicators/9-a-1.md
deleted file mode 100644
index 9bdbb0b6cd9..00000000000
--- a/_indicators/9-a-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.a.1
-layout: indicator
-permalink: /9-a-1/
----
-
-
diff --git a/_indicators/9-b-1.md b/_indicators/9-b-1.md
deleted file mode 100644
index 59f089e2a45..00000000000
--- a/_indicators/9-b-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.b.1
-layout: indicator
-permalink: /9-b-1/
----
-
-
diff --git a/_indicators/9-c-1.md b/_indicators/9-c-1.md
deleted file mode 100644
index 711d85497d6..00000000000
--- a/_indicators/9-c-1.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-indicator: 9.c.1
-layout: indicator
-permalink: /9-c-1/
----
-
-
diff --git a/_indicators/es/1-1-1.md b/_indicators/es/1-1-1.md
deleted file mode 100644
index 6dd0d07cd68..00000000000
--- a/_indicators/es/1-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.1.1
-language: es
-layout: indicator
-permalink: /es/1-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/1-2-1.md b/_indicators/es/1-2-1.md
deleted file mode 100644
index 907df0cf053..00000000000
--- a/_indicators/es/1-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.2.1
-language: es
-layout: indicator
-permalink: /es/1-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/1-2-2.md b/_indicators/es/1-2-2.md
deleted file mode 100644
index 73ea59ce28a..00000000000
--- a/_indicators/es/1-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.2.2
-language: es
-layout: indicator
-permalink: /es/1-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/1-3-1.md b/_indicators/es/1-3-1.md
deleted file mode 100644
index 2ee4388e839..00000000000
--- a/_indicators/es/1-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.3.1
-language: es
-layout: indicator
-permalink: /es/1-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/1-4-1.md b/_indicators/es/1-4-1.md
deleted file mode 100644
index a0bb7050a28..00000000000
--- a/_indicators/es/1-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.4.1
-language: es
-layout: indicator
-permalink: /es/1-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/1-4-2.md b/_indicators/es/1-4-2.md
deleted file mode 100644
index 7a021a32b46..00000000000
--- a/_indicators/es/1-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.4.2
-language: es
-layout: indicator
-permalink: /es/1-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/1-5-1.md b/_indicators/es/1-5-1.md
deleted file mode 100644
index 0d0204e7b56..00000000000
--- a/_indicators/es/1-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.1
-language: es
-layout: indicator
-permalink: /es/1-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/1-5-2.md b/_indicators/es/1-5-2.md
deleted file mode 100644
index 5fb164e3693..00000000000
--- a/_indicators/es/1-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.2
-language: es
-layout: indicator
-permalink: /es/1-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/1-5-3.md b/_indicators/es/1-5-3.md
deleted file mode 100644
index f75abdfaa3a..00000000000
--- a/_indicators/es/1-5-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.3
-language: es
-layout: indicator
-permalink: /es/1-5-3/
----
\ No newline at end of file
diff --git a/_indicators/es/1-5-4.md b/_indicators/es/1-5-4.md
deleted file mode 100644
index dccee84df53..00000000000
--- a/_indicators/es/1-5-4.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.4
-language: es
-layout: indicator
-permalink: /es/1-5-4/
----
\ No newline at end of file
diff --git a/_indicators/es/1-a-1.md b/_indicators/es/1-a-1.md
deleted file mode 100644
index 355179ed11e..00000000000
--- a/_indicators/es/1-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.a.1
-language: es
-layout: indicator
-permalink: /es/1-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/1-a-2.md b/_indicators/es/1-a-2.md
deleted file mode 100644
index 1f1ac337bdc..00000000000
--- a/_indicators/es/1-a-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.a.2
-language: es
-layout: indicator
-permalink: /es/1-a-2/
----
\ No newline at end of file
diff --git a/_indicators/es/1-a-3.md b/_indicators/es/1-a-3.md
deleted file mode 100644
index c83d8c12177..00000000000
--- a/_indicators/es/1-a-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.a.3
-language: es
-layout: indicator
-permalink: /es/1-a-3/
----
\ No newline at end of file
diff --git a/_indicators/es/1-b-1.md b/_indicators/es/1-b-1.md
deleted file mode 100644
index d16242595ed..00000000000
--- a/_indicators/es/1-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.b.1
-language: es
-layout: indicator
-permalink: /es/1-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-1-1.md b/_indicators/es/10-1-1.md
deleted file mode 100644
index 9f0b1003384..00000000000
--- a/_indicators/es/10-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.1.1
-language: es
-layout: indicator
-permalink: /es/10-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-2-1.md b/_indicators/es/10-2-1.md
deleted file mode 100644
index bb5abaea31b..00000000000
--- a/_indicators/es/10-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.2.1
-language: es
-layout: indicator
-permalink: /es/10-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-3-1.md b/_indicators/es/10-3-1.md
deleted file mode 100644
index 287be2c3fff..00000000000
--- a/_indicators/es/10-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.3.1
-language: es
-layout: indicator
-permalink: /es/10-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-4-1.md b/_indicators/es/10-4-1.md
deleted file mode 100644
index 30e50f6ae02..00000000000
--- a/_indicators/es/10-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.4.1
-language: es
-layout: indicator
-permalink: /es/10-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-5-1.md b/_indicators/es/10-5-1.md
deleted file mode 100644
index dcb1c6abb83..00000000000
--- a/_indicators/es/10-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.5.1
-language: es
-layout: indicator
-permalink: /es/10-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-6-1.md b/_indicators/es/10-6-1.md
deleted file mode 100644
index 6b5e98500df..00000000000
--- a/_indicators/es/10-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.6.1
-language: es
-layout: indicator
-permalink: /es/10-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-7-1.md b/_indicators/es/10-7-1.md
deleted file mode 100644
index 950452ac9c2..00000000000
--- a/_indicators/es/10-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.7.1
-language: es
-layout: indicator
-permalink: /es/10-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-7-2.md b/_indicators/es/10-7-2.md
deleted file mode 100644
index f421cfb277c..00000000000
--- a/_indicators/es/10-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.7.2
-language: es
-layout: indicator
-permalink: /es/10-7-2/
----
\ No newline at end of file
diff --git a/_indicators/es/10-a-1.md b/_indicators/es/10-a-1.md
deleted file mode 100644
index 3f3bbfa5ce5..00000000000
--- a/_indicators/es/10-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.a.1
-language: es
-layout: indicator
-permalink: /es/10-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-b-1.md b/_indicators/es/10-b-1.md
deleted file mode 100644
index 5efd3a12c80..00000000000
--- a/_indicators/es/10-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.b.1
-language: es
-layout: indicator
-permalink: /es/10-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/10-c-1.md b/_indicators/es/10-c-1.md
deleted file mode 100644
index 6616bafd575..00000000000
--- a/_indicators/es/10-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.c.1
-language: es
-layout: indicator
-permalink: /es/10-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-1-1.md b/_indicators/es/11-1-1.md
deleted file mode 100644
index 35160a3baab..00000000000
--- a/_indicators/es/11-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.1.1
-language: es
-layout: indicator
-permalink: /es/11-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-2-1.md b/_indicators/es/11-2-1.md
deleted file mode 100644
index 48598741f4e..00000000000
--- a/_indicators/es/11-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.2.1
-language: es
-layout: indicator
-permalink: /es/11-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-3-1.md b/_indicators/es/11-3-1.md
deleted file mode 100644
index 9b86cac7fcb..00000000000
--- a/_indicators/es/11-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.3.1
-language: es
-layout: indicator
-permalink: /es/11-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-3-2.md b/_indicators/es/11-3-2.md
deleted file mode 100644
index e927e413d5d..00000000000
--- a/_indicators/es/11-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.3.2
-language: es
-layout: indicator
-permalink: /es/11-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/11-4-1.md b/_indicators/es/11-4-1.md
deleted file mode 100644
index 4d18df79981..00000000000
--- a/_indicators/es/11-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.4.1
-language: es
-layout: indicator
-permalink: /es/11-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-5-1.md b/_indicators/es/11-5-1.md
deleted file mode 100644
index 600d168ba8f..00000000000
--- a/_indicators/es/11-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.5.1
-language: es
-layout: indicator
-permalink: /es/11-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-5-2.md b/_indicators/es/11-5-2.md
deleted file mode 100644
index 4d2f4bb1b9b..00000000000
--- a/_indicators/es/11-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.5.2
-language: es
-layout: indicator
-permalink: /es/11-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/11-6-1.md b/_indicators/es/11-6-1.md
deleted file mode 100644
index f746a47287a..00000000000
--- a/_indicators/es/11-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.6.1
-language: es
-layout: indicator
-permalink: /es/11-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-6-2.md b/_indicators/es/11-6-2.md
deleted file mode 100644
index 2ba8f560c5f..00000000000
--- a/_indicators/es/11-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.6.2
-language: es
-layout: indicator
-permalink: /es/11-6-2/
----
\ No newline at end of file
diff --git a/_indicators/es/11-7-1.md b/_indicators/es/11-7-1.md
deleted file mode 100644
index 1a0a8deeead..00000000000
--- a/_indicators/es/11-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.7.1
-language: es
-layout: indicator
-permalink: /es/11-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-7-2.md b/_indicators/es/11-7-2.md
deleted file mode 100644
index d0c8b1ca091..00000000000
--- a/_indicators/es/11-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.7.2
-language: es
-layout: indicator
-permalink: /es/11-7-2/
----
\ No newline at end of file
diff --git a/_indicators/es/11-a-1.md b/_indicators/es/11-a-1.md
deleted file mode 100644
index 9d3162f8f4f..00000000000
--- a/_indicators/es/11-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.a.1
-language: es
-layout: indicator
-permalink: /es/11-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-b-1.md b/_indicators/es/11-b-1.md
deleted file mode 100644
index 016daa000d3..00000000000
--- a/_indicators/es/11-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.b.1
-language: es
-layout: indicator
-permalink: /es/11-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/11-b-2.md b/_indicators/es/11-b-2.md
deleted file mode 100644
index de6b6b8f575..00000000000
--- a/_indicators/es/11-b-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.b.2
-language: es
-layout: indicator
-permalink: /es/11-b-2/
----
\ No newline at end of file
diff --git a/_indicators/es/11-c-1.md b/_indicators/es/11-c-1.md
deleted file mode 100644
index f85ce428098..00000000000
--- a/_indicators/es/11-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.c.1
-language: es
-layout: indicator
-permalink: /es/11-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-1-1.md b/_indicators/es/12-1-1.md
deleted file mode 100644
index 213cc140057..00000000000
--- a/_indicators/es/12-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.1.1
-language: es
-layout: indicator
-permalink: /es/12-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-2-1.md b/_indicators/es/12-2-1.md
deleted file mode 100644
index 2d791163382..00000000000
--- a/_indicators/es/12-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.2.1
-language: es
-layout: indicator
-permalink: /es/12-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-2-2.md b/_indicators/es/12-2-2.md
deleted file mode 100644
index ec0a433222b..00000000000
--- a/_indicators/es/12-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.2.2
-language: es
-layout: indicator
-permalink: /es/12-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/12-3-1.md b/_indicators/es/12-3-1.md
deleted file mode 100644
index 389b4ec4a32..00000000000
--- a/_indicators/es/12-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.3.1
-language: es
-layout: indicator
-permalink: /es/12-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-4-1.md b/_indicators/es/12-4-1.md
deleted file mode 100644
index e5c3f5ebf97..00000000000
--- a/_indicators/es/12-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.4.1
-language: es
-layout: indicator
-permalink: /es/12-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-4-2.md b/_indicators/es/12-4-2.md
deleted file mode 100644
index df31691f6c4..00000000000
--- a/_indicators/es/12-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.4.2
-language: es
-layout: indicator
-permalink: /es/12-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/12-5-1.md b/_indicators/es/12-5-1.md
deleted file mode 100644
index 169e3e2f3ef..00000000000
--- a/_indicators/es/12-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.5.1
-language: es
-layout: indicator
-permalink: /es/12-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-6-1.md b/_indicators/es/12-6-1.md
deleted file mode 100644
index 15c63692351..00000000000
--- a/_indicators/es/12-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.6.1
-language: es
-layout: indicator
-permalink: /es/12-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-7-1.md b/_indicators/es/12-7-1.md
deleted file mode 100644
index 0f436e65a58..00000000000
--- a/_indicators/es/12-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.7.1
-language: es
-layout: indicator
-permalink: /es/12-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-8-1.md b/_indicators/es/12-8-1.md
deleted file mode 100644
index bcef0c5e747..00000000000
--- a/_indicators/es/12-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.8.1
-language: es
-layout: indicator
-permalink: /es/12-8-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-a-1.md b/_indicators/es/12-a-1.md
deleted file mode 100644
index f8f832894a0..00000000000
--- a/_indicators/es/12-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.a.1
-language: es
-layout: indicator
-permalink: /es/12-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-b-1.md b/_indicators/es/12-b-1.md
deleted file mode 100644
index ae38454fc55..00000000000
--- a/_indicators/es/12-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.b.1
-language: es
-layout: indicator
-permalink: /es/12-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/12-c-1.md b/_indicators/es/12-c-1.md
deleted file mode 100644
index 337546bfb79..00000000000
--- a/_indicators/es/12-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.c.1
-language: es
-layout: indicator
-permalink: /es/12-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/13-1-1.md b/_indicators/es/13-1-1.md
deleted file mode 100644
index 241ce5c6b3a..00000000000
--- a/_indicators/es/13-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.1.1
-language: es
-layout: indicator
-permalink: /es/13-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/13-1-2.md b/_indicators/es/13-1-2.md
deleted file mode 100644
index f03ebd638e0..00000000000
--- a/_indicators/es/13-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.1.2
-language: es
-layout: indicator
-permalink: /es/13-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/13-1-3.md b/_indicators/es/13-1-3.md
deleted file mode 100644
index 15cf3d3d4b7..00000000000
--- a/_indicators/es/13-1-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.1.3
-language: es
-layout: indicator
-permalink: /es/13-1-3/
----
\ No newline at end of file
diff --git a/_indicators/es/13-2-1.md b/_indicators/es/13-2-1.md
deleted file mode 100644
index 3483d84f102..00000000000
--- a/_indicators/es/13-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.2.1
-language: es
-layout: indicator
-permalink: /es/13-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/13-3-1.md b/_indicators/es/13-3-1.md
deleted file mode 100644
index fc893c5d000..00000000000
--- a/_indicators/es/13-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.3.1
-language: es
-layout: indicator
-permalink: /es/13-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/13-3-2.md b/_indicators/es/13-3-2.md
deleted file mode 100644
index e51bc01fa90..00000000000
--- a/_indicators/es/13-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.3.2
-language: es
-layout: indicator
-permalink: /es/13-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/13-a-1.md b/_indicators/es/13-a-1.md
deleted file mode 100644
index 539c9c7f668..00000000000
--- a/_indicators/es/13-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.a.1
-language: es
-layout: indicator
-permalink: /es/13-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/13-b-1.md b/_indicators/es/13-b-1.md
deleted file mode 100644
index a1c6ff29046..00000000000
--- a/_indicators/es/13-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.b.1
-language: es
-layout: indicator
-permalink: /es/13-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-1-1.md b/_indicators/es/14-1-1.md
deleted file mode 100644
index 697e6e8f9b9..00000000000
--- a/_indicators/es/14-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.1.1
-language: es
-layout: indicator
-permalink: /es/14-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-2-1.md b/_indicators/es/14-2-1.md
deleted file mode 100644
index 4ce9d20d80b..00000000000
--- a/_indicators/es/14-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.2.1
-language: es
-layout: indicator
-permalink: /es/14-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-3-1.md b/_indicators/es/14-3-1.md
deleted file mode 100644
index f1e8ef0f020..00000000000
--- a/_indicators/es/14-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.3.1
-language: es
-layout: indicator
-permalink: /es/14-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-4-1.md b/_indicators/es/14-4-1.md
deleted file mode 100644
index 8d137539b12..00000000000
--- a/_indicators/es/14-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.4.1
-language: es
-layout: indicator
-permalink: /es/14-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-5-1.md b/_indicators/es/14-5-1.md
deleted file mode 100644
index e2d778ee1a7..00000000000
--- a/_indicators/es/14-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.5.1
-language: es
-layout: indicator
-permalink: /es/14-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-6-1.md b/_indicators/es/14-6-1.md
deleted file mode 100644
index 3f78d7b2e72..00000000000
--- a/_indicators/es/14-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.6.1
-language: es
-layout: indicator
-permalink: /es/14-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-7-1.md b/_indicators/es/14-7-1.md
deleted file mode 100644
index b7782fb8983..00000000000
--- a/_indicators/es/14-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.7.1
-language: es
-layout: indicator
-permalink: /es/14-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-a-1.md b/_indicators/es/14-a-1.md
deleted file mode 100644
index 90796105621..00000000000
--- a/_indicators/es/14-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.a.1
-language: es
-layout: indicator
-permalink: /es/14-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-b-1.md b/_indicators/es/14-b-1.md
deleted file mode 100644
index 9b5745f96c2..00000000000
--- a/_indicators/es/14-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.b.1
-language: es
-layout: indicator
-permalink: /es/14-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/14-c-1.md b/_indicators/es/14-c-1.md
deleted file mode 100644
index 55834861602..00000000000
--- a/_indicators/es/14-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.c.1
-language: es
-layout: indicator
-permalink: /es/14-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-1-1.md b/_indicators/es/15-1-1.md
deleted file mode 100644
index 5e35eb1bd24..00000000000
--- a/_indicators/es/15-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.1.1
-language: es
-layout: indicator
-permalink: /es/15-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-1-2.md b/_indicators/es/15-1-2.md
deleted file mode 100644
index dbdf5c8da8c..00000000000
--- a/_indicators/es/15-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.1.2
-language: es
-layout: indicator
-permalink: /es/15-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/15-2-1.md b/_indicators/es/15-2-1.md
deleted file mode 100644
index 5a3fb1a256f..00000000000
--- a/_indicators/es/15-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.2.1
-language: es
-layout: indicator
-permalink: /es/15-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-3-1.md b/_indicators/es/15-3-1.md
deleted file mode 100644
index 162b7ef03e8..00000000000
--- a/_indicators/es/15-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.3.1
-language: es
-layout: indicator
-permalink: /es/15-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-4-1.md b/_indicators/es/15-4-1.md
deleted file mode 100644
index 155569987c4..00000000000
--- a/_indicators/es/15-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.4.1
-language: es
-layout: indicator
-permalink: /es/15-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-4-2.md b/_indicators/es/15-4-2.md
deleted file mode 100644
index 621d1d3ef17..00000000000
--- a/_indicators/es/15-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.4.2
-language: es
-layout: indicator
-permalink: /es/15-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/15-5-1.md b/_indicators/es/15-5-1.md
deleted file mode 100644
index c291ccc0de7..00000000000
--- a/_indicators/es/15-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.5.1
-language: es
-layout: indicator
-permalink: /es/15-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-6-1.md b/_indicators/es/15-6-1.md
deleted file mode 100644
index e10eb0b7fc3..00000000000
--- a/_indicators/es/15-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.6.1
-language: es
-layout: indicator
-permalink: /es/15-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-7-1.md b/_indicators/es/15-7-1.md
deleted file mode 100644
index f76f0631e7c..00000000000
--- a/_indicators/es/15-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.7.1
-language: es
-layout: indicator
-permalink: /es/15-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-8-1.md b/_indicators/es/15-8-1.md
deleted file mode 100644
index fcb7f44298f..00000000000
--- a/_indicators/es/15-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.8.1
-language: es
-layout: indicator
-permalink: /es/15-8-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-9-1.md b/_indicators/es/15-9-1.md
deleted file mode 100644
index f3a854a9000..00000000000
--- a/_indicators/es/15-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.9.1
-language: es
-layout: indicator
-permalink: /es/15-9-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-a-1.md b/_indicators/es/15-a-1.md
deleted file mode 100644
index 4219f5ebb24..00000000000
--- a/_indicators/es/15-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.a.1
-language: es
-layout: indicator
-permalink: /es/15-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-b-1.md b/_indicators/es/15-b-1.md
deleted file mode 100644
index 31dbe0780b5..00000000000
--- a/_indicators/es/15-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.b.1
-language: es
-layout: indicator
-permalink: /es/15-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/15-c-1.md b/_indicators/es/15-c-1.md
deleted file mode 100644
index 1078a8e6474..00000000000
--- a/_indicators/es/15-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.c.1
-language: es
-layout: indicator
-permalink: /es/15-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-1-1.md b/_indicators/es/16-1-1.md
deleted file mode 100644
index e015391c124..00000000000
--- a/_indicators/es/16-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.1
-language: es
-layout: indicator
-permalink: /es/16-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-1-2.md b/_indicators/es/16-1-2.md
deleted file mode 100644
index d9eccf24bb1..00000000000
--- a/_indicators/es/16-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.2
-language: es
-layout: indicator
-permalink: /es/16-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-1-3.md b/_indicators/es/16-1-3.md
deleted file mode 100644
index 51f6028872b..00000000000
--- a/_indicators/es/16-1-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.3
-language: es
-layout: indicator
-permalink: /es/16-1-3/
----
\ No newline at end of file
diff --git a/_indicators/es/16-1-4.md b/_indicators/es/16-1-4.md
deleted file mode 100644
index b70b2668441..00000000000
--- a/_indicators/es/16-1-4.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.4
-language: es
-layout: indicator
-permalink: /es/16-1-4/
----
\ No newline at end of file
diff --git a/_indicators/es/16-10-1.md b/_indicators/es/16-10-1.md
deleted file mode 100644
index 6670ed8a521..00000000000
--- a/_indicators/es/16-10-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.10.1
-language: es
-layout: indicator
-permalink: /es/16-10-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-10-2.md b/_indicators/es/16-10-2.md
deleted file mode 100644
index 8705f6d65a5..00000000000
--- a/_indicators/es/16-10-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.10.2
-language: es
-layout: indicator
-permalink: /es/16-10-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-2-1.md b/_indicators/es/16-2-1.md
deleted file mode 100644
index 0567aa20997..00000000000
--- a/_indicators/es/16-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.2.1
-language: es
-layout: indicator
-permalink: /es/16-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-2-2.md b/_indicators/es/16-2-2.md
deleted file mode 100644
index 34760261c48..00000000000
--- a/_indicators/es/16-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.2.2
-language: es
-layout: indicator
-permalink: /es/16-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-2-3.md b/_indicators/es/16-2-3.md
deleted file mode 100644
index d91eae81531..00000000000
--- a/_indicators/es/16-2-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.2.3
-language: es
-layout: indicator
-permalink: /es/16-2-3/
----
\ No newline at end of file
diff --git a/_indicators/es/16-3-1.md b/_indicators/es/16-3-1.md
deleted file mode 100644
index 2097d4aa923..00000000000
--- a/_indicators/es/16-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.3.1
-language: es
-layout: indicator
-permalink: /es/16-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-3-2.md b/_indicators/es/16-3-2.md
deleted file mode 100644
index 0954fdea370..00000000000
--- a/_indicators/es/16-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.3.2
-language: es
-layout: indicator
-permalink: /es/16-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-4-1.md b/_indicators/es/16-4-1.md
deleted file mode 100644
index af937fce12f..00000000000
--- a/_indicators/es/16-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.4.1
-language: es
-layout: indicator
-permalink: /es/16-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-4-2.md b/_indicators/es/16-4-2.md
deleted file mode 100644
index 958bd79c70b..00000000000
--- a/_indicators/es/16-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.4.2
-language: es
-layout: indicator
-permalink: /es/16-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-5-1.md b/_indicators/es/16-5-1.md
deleted file mode 100644
index 500ffc707c8..00000000000
--- a/_indicators/es/16-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.5.1
-language: es
-layout: indicator
-permalink: /es/16-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-5-2.md b/_indicators/es/16-5-2.md
deleted file mode 100644
index b83f2aa0753..00000000000
--- a/_indicators/es/16-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.5.2
-language: es
-layout: indicator
-permalink: /es/16-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-6-1.md b/_indicators/es/16-6-1.md
deleted file mode 100644
index 055f16a5a23..00000000000
--- a/_indicators/es/16-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.6.1
-language: es
-layout: indicator
-permalink: /es/16-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-6-2.md b/_indicators/es/16-6-2.md
deleted file mode 100644
index cb772b6ff8f..00000000000
--- a/_indicators/es/16-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.6.2
-language: es
-layout: indicator
-permalink: /es/16-6-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-7-1.md b/_indicators/es/16-7-1.md
deleted file mode 100644
index f5cbaf1aeaf..00000000000
--- a/_indicators/es/16-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.7.1
-language: es
-layout: indicator
-permalink: /es/16-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-7-2.md b/_indicators/es/16-7-2.md
deleted file mode 100644
index 9491a0e16e5..00000000000
--- a/_indicators/es/16-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.7.2
-language: es
-layout: indicator
-permalink: /es/16-7-2/
----
\ No newline at end of file
diff --git a/_indicators/es/16-8-1.md b/_indicators/es/16-8-1.md
deleted file mode 100644
index e001b30bf91..00000000000
--- a/_indicators/es/16-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.8.1
-language: es
-layout: indicator
-permalink: /es/16-8-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-9-1.md b/_indicators/es/16-9-1.md
deleted file mode 100644
index 3c3f07aa0f8..00000000000
--- a/_indicators/es/16-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.9.1
-language: es
-layout: indicator
-permalink: /es/16-9-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-a-1.md b/_indicators/es/16-a-1.md
deleted file mode 100644
index b7a66703e39..00000000000
--- a/_indicators/es/16-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.a.1
-language: es
-layout: indicator
-permalink: /es/16-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/16-b-1.md b/_indicators/es/16-b-1.md
deleted file mode 100644
index e10756a8302..00000000000
--- a/_indicators/es/16-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.b.1
-language: es
-layout: indicator
-permalink: /es/16-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-1-1.md b/_indicators/es/17-1-1.md
deleted file mode 100644
index fd1fed96238..00000000000
--- a/_indicators/es/17-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.1.1
-language: es
-layout: indicator
-permalink: /es/17-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-1-2.md b/_indicators/es/17-1-2.md
deleted file mode 100644
index d61f3fc7895..00000000000
--- a/_indicators/es/17-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.1.2
-language: es
-layout: indicator
-permalink: /es/17-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/17-10-1.md b/_indicators/es/17-10-1.md
deleted file mode 100644
index f756aad667b..00000000000
--- a/_indicators/es/17-10-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.10.1
-language: es
-layout: indicator
-permalink: /es/17-10-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-11-1.md b/_indicators/es/17-11-1.md
deleted file mode 100644
index 7e93b4278b4..00000000000
--- a/_indicators/es/17-11-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.11.1
-language: es
-layout: indicator
-permalink: /es/17-11-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-12-1.md b/_indicators/es/17-12-1.md
deleted file mode 100644
index 216a68b3533..00000000000
--- a/_indicators/es/17-12-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.12.1
-language: es
-layout: indicator
-permalink: /es/17-12-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-13-1.md b/_indicators/es/17-13-1.md
deleted file mode 100644
index 9850e1f1516..00000000000
--- a/_indicators/es/17-13-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.13.1
-language: es
-layout: indicator
-permalink: /es/17-13-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-14-1.md b/_indicators/es/17-14-1.md
deleted file mode 100644
index d1c2057ae32..00000000000
--- a/_indicators/es/17-14-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.14.1
-language: es
-layout: indicator
-permalink: /es/17-14-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-15-1.md b/_indicators/es/17-15-1.md
deleted file mode 100644
index 01aa8c79480..00000000000
--- a/_indicators/es/17-15-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.15.1
-language: es
-layout: indicator
-permalink: /es/17-15-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-16-1.md b/_indicators/es/17-16-1.md
deleted file mode 100644
index 625a935de24..00000000000
--- a/_indicators/es/17-16-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.16.1
-language: es
-layout: indicator
-permalink: /es/17-16-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-17-1.md b/_indicators/es/17-17-1.md
deleted file mode 100644
index 64a9a436342..00000000000
--- a/_indicators/es/17-17-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.17.1
-language: es
-layout: indicator
-permalink: /es/17-17-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-18-1.md b/_indicators/es/17-18-1.md
deleted file mode 100644
index ea117f1a796..00000000000
--- a/_indicators/es/17-18-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.18.1
-language: es
-layout: indicator
-permalink: /es/17-18-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-18-2.md b/_indicators/es/17-18-2.md
deleted file mode 100644
index e0845bce72d..00000000000
--- a/_indicators/es/17-18-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.18.2
-language: es
-layout: indicator
-permalink: /es/17-18-2/
----
\ No newline at end of file
diff --git a/_indicators/es/17-18-3.md b/_indicators/es/17-18-3.md
deleted file mode 100644
index 34fe3efb995..00000000000
--- a/_indicators/es/17-18-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.18.3
-language: es
-layout: indicator
-permalink: /es/17-18-3/
----
\ No newline at end of file
diff --git a/_indicators/es/17-19-1.md b/_indicators/es/17-19-1.md
deleted file mode 100644
index be14fa2a512..00000000000
--- a/_indicators/es/17-19-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.19.1
-language: es
-layout: indicator
-permalink: /es/17-19-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-19-2.md b/_indicators/es/17-19-2.md
deleted file mode 100644
index e1cff109d52..00000000000
--- a/_indicators/es/17-19-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.19.2
-language: es
-layout: indicator
-permalink: /es/17-19-2/
----
\ No newline at end of file
diff --git a/_indicators/es/17-2-1.md b/_indicators/es/17-2-1.md
deleted file mode 100644
index c25e9641bac..00000000000
--- a/_indicators/es/17-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.2.1
-language: es
-layout: indicator
-permalink: /es/17-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-3-1.md b/_indicators/es/17-3-1.md
deleted file mode 100644
index 979f8c816b4..00000000000
--- a/_indicators/es/17-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.3.1
-language: es
-layout: indicator
-permalink: /es/17-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-3-2.md b/_indicators/es/17-3-2.md
deleted file mode 100644
index a90bdfae519..00000000000
--- a/_indicators/es/17-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.3.2
-language: es
-layout: indicator
-permalink: /es/17-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/17-4-1.md b/_indicators/es/17-4-1.md
deleted file mode 100644
index 525e092ba6f..00000000000
--- a/_indicators/es/17-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.4.1
-language: es
-layout: indicator
-permalink: /es/17-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-5-1.md b/_indicators/es/17-5-1.md
deleted file mode 100644
index e9675c31def..00000000000
--- a/_indicators/es/17-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.5.1
-language: es
-layout: indicator
-permalink: /es/17-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-6-1.md b/_indicators/es/17-6-1.md
deleted file mode 100644
index c9a62afca2d..00000000000
--- a/_indicators/es/17-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.6.1
-language: es
-layout: indicator
-permalink: /es/17-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-6-2.md b/_indicators/es/17-6-2.md
deleted file mode 100644
index 37d9280fdc2..00000000000
--- a/_indicators/es/17-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.6.2
-language: es
-layout: indicator
-permalink: /es/17-6-2/
----
\ No newline at end of file
diff --git a/_indicators/es/17-7-1.md b/_indicators/es/17-7-1.md
deleted file mode 100644
index 47f47280ba4..00000000000
--- a/_indicators/es/17-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.7.1
-language: es
-layout: indicator
-permalink: /es/17-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-8-1.md b/_indicators/es/17-8-1.md
deleted file mode 100644
index e152235e6ad..00000000000
--- a/_indicators/es/17-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.8.1
-language: es
-layout: indicator
-permalink: /es/17-8-1/
----
\ No newline at end of file
diff --git a/_indicators/es/17-9-1.md b/_indicators/es/17-9-1.md
deleted file mode 100644
index 9315832cfca..00000000000
--- a/_indicators/es/17-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.9.1
-language: es
-layout: indicator
-permalink: /es/17-9-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-1-1.md b/_indicators/es/2-1-1.md
deleted file mode 100644
index 844d9651430..00000000000
--- a/_indicators/es/2-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.1.1
-language: es
-layout: indicator
-permalink: /es/2-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-1-2.md b/_indicators/es/2-1-2.md
deleted file mode 100644
index eeba0074ade..00000000000
--- a/_indicators/es/2-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.1.2
-language: es
-layout: indicator
-permalink: /es/2-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/2-2-1.md b/_indicators/es/2-2-1.md
deleted file mode 100644
index 5e4431bc90b..00000000000
--- a/_indicators/es/2-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.2.1
-language: es
-layout: indicator
-permalink: /es/2-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-2-2.md b/_indicators/es/2-2-2.md
deleted file mode 100644
index 93f405255f5..00000000000
--- a/_indicators/es/2-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.2.2
-language: es
-layout: indicator
-permalink: /es/2-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/2-3-1.md b/_indicators/es/2-3-1.md
deleted file mode 100644
index 719b5c4426c..00000000000
--- a/_indicators/es/2-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.3.1
-language: es
-layout: indicator
-permalink: /es/2-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-3-2.md b/_indicators/es/2-3-2.md
deleted file mode 100644
index 1629efb5864..00000000000
--- a/_indicators/es/2-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.3.2
-language: es
-layout: indicator
-permalink: /es/2-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/2-4-1.md b/_indicators/es/2-4-1.md
deleted file mode 100644
index 3c4d12dbb46..00000000000
--- a/_indicators/es/2-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.4.1
-language: es
-layout: indicator
-permalink: /es/2-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-5-1.md b/_indicators/es/2-5-1.md
deleted file mode 100644
index 41a204d2d14..00000000000
--- a/_indicators/es/2-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.5.1
-language: es
-layout: indicator
-permalink: /es/2-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-5-2.md b/_indicators/es/2-5-2.md
deleted file mode 100644
index b49cc460e2e..00000000000
--- a/_indicators/es/2-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.5.2
-language: es
-layout: indicator
-permalink: /es/2-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/2-a-1.md b/_indicators/es/2-a-1.md
deleted file mode 100644
index 677deacf13c..00000000000
--- a/_indicators/es/2-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.a.1
-language: es
-layout: indicator
-permalink: /es/2-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-a-2.md b/_indicators/es/2-a-2.md
deleted file mode 100644
index 1f8836b235b..00000000000
--- a/_indicators/es/2-a-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.a.2
-language: es
-layout: indicator
-permalink: /es/2-a-2/
----
\ No newline at end of file
diff --git a/_indicators/es/2-b-1.md b/_indicators/es/2-b-1.md
deleted file mode 100644
index f97b7c47170..00000000000
--- a/_indicators/es/2-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.b.1
-language: es
-layout: indicator
-permalink: /es/2-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/2-c-1.md b/_indicators/es/2-c-1.md
deleted file mode 100644
index 56bbd3c57f9..00000000000
--- a/_indicators/es/2-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.c.1
-language: es
-layout: indicator
-permalink: /es/2-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-1-1.md b/_indicators/es/3-1-1.md
deleted file mode 100644
index 960324b2c5e..00000000000
--- a/_indicators/es/3-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.1.1
-language: es
-layout: indicator
-permalink: /es/3-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-1-2.md b/_indicators/es/3-1-2.md
deleted file mode 100644
index 3bbeea90ac4..00000000000
--- a/_indicators/es/3-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.1.2
-language: es
-layout: indicator
-permalink: /es/3-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-2-1.md b/_indicators/es/3-2-1.md
deleted file mode 100644
index 1cef47e8b49..00000000000
--- a/_indicators/es/3-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.2.1
-language: es
-layout: indicator
-permalink: /es/3-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-2-2.md b/_indicators/es/3-2-2.md
deleted file mode 100644
index 17ccc2691c9..00000000000
--- a/_indicators/es/3-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.2.2
-language: es
-layout: indicator
-permalink: /es/3-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-3-1.md b/_indicators/es/3-3-1.md
deleted file mode 100644
index f44ceca81e7..00000000000
--- a/_indicators/es/3-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.1
-language: es
-layout: indicator
-permalink: /es/3-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-3-2.md b/_indicators/es/3-3-2.md
deleted file mode 100644
index b84f04f561d..00000000000
--- a/_indicators/es/3-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.2
-language: es
-layout: indicator
-permalink: /es/3-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-3-3.md b/_indicators/es/3-3-3.md
deleted file mode 100644
index 63c544977c4..00000000000
--- a/_indicators/es/3-3-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.3
-language: es
-layout: indicator
-permalink: /es/3-3-3/
----
\ No newline at end of file
diff --git a/_indicators/es/3-3-4.md b/_indicators/es/3-3-4.md
deleted file mode 100644
index 4d9ec43f6ee..00000000000
--- a/_indicators/es/3-3-4.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.4
-language: es
-layout: indicator
-permalink: /es/3-3-4/
----
\ No newline at end of file
diff --git a/_indicators/es/3-3-5.md b/_indicators/es/3-3-5.md
deleted file mode 100644
index 1ae51d3e208..00000000000
--- a/_indicators/es/3-3-5.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.5
-language: es
-layout: indicator
-permalink: /es/3-3-5/
----
\ No newline at end of file
diff --git a/_indicators/es/3-4-1.md b/_indicators/es/3-4-1.md
deleted file mode 100644
index c8650af8c5e..00000000000
--- a/_indicators/es/3-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.4.1
-language: es
-layout: indicator
-permalink: /es/3-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-4-2.md b/_indicators/es/3-4-2.md
deleted file mode 100644
index f6a354289cf..00000000000
--- a/_indicators/es/3-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.4.2
-language: es
-layout: indicator
-permalink: /es/3-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-5-1.md b/_indicators/es/3-5-1.md
deleted file mode 100644
index 49003ae62a7..00000000000
--- a/_indicators/es/3-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.5.1
-language: es
-layout: indicator
-permalink: /es/3-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-5-2.md b/_indicators/es/3-5-2.md
deleted file mode 100644
index 244a1f032ba..00000000000
--- a/_indicators/es/3-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.5.2
-language: es
-layout: indicator
-permalink: /es/3-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-6-1.md b/_indicators/es/3-6-1.md
deleted file mode 100644
index 36e6dd2e774..00000000000
--- a/_indicators/es/3-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.6.1
-language: es
-layout: indicator
-permalink: /es/3-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-7-1.md b/_indicators/es/3-7-1.md
deleted file mode 100644
index d4f75e25df0..00000000000
--- a/_indicators/es/3-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.7.1
-language: es
-layout: indicator
-permalink: /es/3-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-7-2.md b/_indicators/es/3-7-2.md
deleted file mode 100644
index 33481e518bb..00000000000
--- a/_indicators/es/3-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.7.2
-language: es
-layout: indicator
-permalink: /es/3-7-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-8-1.md b/_indicators/es/3-8-1.md
deleted file mode 100644
index d3dafb22d36..00000000000
--- a/_indicators/es/3-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.8.1
-language: es
-layout: indicator
-permalink: /es/3-8-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-8-2.md b/_indicators/es/3-8-2.md
deleted file mode 100644
index b9024b1d7dc..00000000000
--- a/_indicators/es/3-8-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.8.2
-language: es
-layout: indicator
-permalink: /es/3-8-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-9-1.md b/_indicators/es/3-9-1.md
deleted file mode 100644
index 803cd358641..00000000000
--- a/_indicators/es/3-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.9.1
-language: es
-layout: indicator
-permalink: /es/3-9-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-9-2.md b/_indicators/es/3-9-2.md
deleted file mode 100644
index f04fc74b9ec..00000000000
--- a/_indicators/es/3-9-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.9.2
-language: es
-layout: indicator
-permalink: /es/3-9-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-9-3.md b/_indicators/es/3-9-3.md
deleted file mode 100644
index ec8c1429415..00000000000
--- a/_indicators/es/3-9-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.9.3
-language: es
-layout: indicator
-permalink: /es/3-9-3/
----
\ No newline at end of file
diff --git a/_indicators/es/3-a-1.md b/_indicators/es/3-a-1.md
deleted file mode 100644
index 31042a0bc2b..00000000000
--- a/_indicators/es/3-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.a.1
-language: es
-layout: indicator
-permalink: /es/3-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-b-1.md b/_indicators/es/3-b-1.md
deleted file mode 100644
index ba1b95f38d5..00000000000
--- a/_indicators/es/3-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.b.1
-language: es
-layout: indicator
-permalink: /es/3-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-b-2.md b/_indicators/es/3-b-2.md
deleted file mode 100644
index a585eaad56d..00000000000
--- a/_indicators/es/3-b-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.b.2
-language: es
-layout: indicator
-permalink: /es/3-b-2/
----
\ No newline at end of file
diff --git a/_indicators/es/3-b-3.md b/_indicators/es/3-b-3.md
deleted file mode 100644
index 23985365706..00000000000
--- a/_indicators/es/3-b-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.b.3
-language: es
-layout: indicator
-permalink: /es/3-b-3/
----
\ No newline at end of file
diff --git a/_indicators/es/3-c-1.md b/_indicators/es/3-c-1.md
deleted file mode 100644
index 308a57508f9..00000000000
--- a/_indicators/es/3-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.c.1
-language: es
-layout: indicator
-permalink: /es/3-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/3-d-1.md b/_indicators/es/3-d-1.md
deleted file mode 100644
index 74682867bad..00000000000
--- a/_indicators/es/3-d-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.d.1
-language: es
-layout: indicator
-permalink: /es/3-d-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-1-1.md b/_indicators/es/4-1-1.md
deleted file mode 100644
index db91a5c797b..00000000000
--- a/_indicators/es/4-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.1.1
-language: es
-layout: indicator
-permalink: /es/4-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-2-1.md b/_indicators/es/4-2-1.md
deleted file mode 100644
index ccd75035353..00000000000
--- a/_indicators/es/4-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.2.1
-language: es
-layout: indicator
-permalink: /es/4-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-2-2.md b/_indicators/es/4-2-2.md
deleted file mode 100644
index f73c54f1752..00000000000
--- a/_indicators/es/4-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.2.2
-language: es
-layout: indicator
-permalink: /es/4-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/4-3-1.md b/_indicators/es/4-3-1.md
deleted file mode 100644
index 4286c4d00b8..00000000000
--- a/_indicators/es/4-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.3.1
-language: es
-layout: indicator
-permalink: /es/4-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-4-1.md b/_indicators/es/4-4-1.md
deleted file mode 100644
index 91bb74df7b9..00000000000
--- a/_indicators/es/4-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.4.1
-language: es
-layout: indicator
-permalink: /es/4-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-5-1.md b/_indicators/es/4-5-1.md
deleted file mode 100644
index c29be668a80..00000000000
--- a/_indicators/es/4-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.5.1
-language: es
-layout: indicator
-permalink: /es/4-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-6-1.md b/_indicators/es/4-6-1.md
deleted file mode 100644
index e07124c958f..00000000000
--- a/_indicators/es/4-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.6.1
-language: es
-layout: indicator
-permalink: /es/4-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-7-1.md b/_indicators/es/4-7-1.md
deleted file mode 100644
index 05125a046ad..00000000000
--- a/_indicators/es/4-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.7.1
-language: es
-layout: indicator
-permalink: /es/4-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-a-1.md b/_indicators/es/4-a-1.md
deleted file mode 100644
index f38598ab640..00000000000
--- a/_indicators/es/4-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.a.1
-language: es
-layout: indicator
-permalink: /es/4-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-b-1.md b/_indicators/es/4-b-1.md
deleted file mode 100644
index 95db53056e6..00000000000
--- a/_indicators/es/4-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.b.1
-language: es
-layout: indicator
-permalink: /es/4-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/4-c-1.md b/_indicators/es/4-c-1.md
deleted file mode 100644
index a608c6a24d3..00000000000
--- a/_indicators/es/4-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.c.1
-language: es
-layout: indicator
-permalink: /es/4-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-1-1.md b/_indicators/es/5-1-1.md
deleted file mode 100644
index cd2eb1369bd..00000000000
--- a/_indicators/es/5-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.1.1
-language: es
-layout: indicator
-permalink: /es/5-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-2-1.md b/_indicators/es/5-2-1.md
deleted file mode 100644
index 1390f38b2a1..00000000000
--- a/_indicators/es/5-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.2.1
-language: es
-layout: indicator
-permalink: /es/5-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-2-2.md b/_indicators/es/5-2-2.md
deleted file mode 100644
index 7262126b60b..00000000000
--- a/_indicators/es/5-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.2.2
-language: es
-layout: indicator
-permalink: /es/5-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/5-3-1.md b/_indicators/es/5-3-1.md
deleted file mode 100644
index 29ba5d5d420..00000000000
--- a/_indicators/es/5-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.3.1
-language: es
-layout: indicator
-permalink: /es/5-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-3-2.md b/_indicators/es/5-3-2.md
deleted file mode 100644
index af968d734f0..00000000000
--- a/_indicators/es/5-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.3.2
-language: es
-layout: indicator
-permalink: /es/5-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/5-4-1.md b/_indicators/es/5-4-1.md
deleted file mode 100644
index 2e07b8dd81b..00000000000
--- a/_indicators/es/5-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.4.1
-language: es
-layout: indicator
-permalink: /es/5-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-5-1.md b/_indicators/es/5-5-1.md
deleted file mode 100644
index 24d0e2369a0..00000000000
--- a/_indicators/es/5-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.5.1
-language: es
-layout: indicator
-permalink: /es/5-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-5-2.md b/_indicators/es/5-5-2.md
deleted file mode 100644
index 3a90bf8c9d5..00000000000
--- a/_indicators/es/5-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.5.2
-language: es
-layout: indicator
-permalink: /es/5-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/5-6-1.md b/_indicators/es/5-6-1.md
deleted file mode 100644
index f08f36939c4..00000000000
--- a/_indicators/es/5-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.6.1
-language: es
-layout: indicator
-permalink: /es/5-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-6-2.md b/_indicators/es/5-6-2.md
deleted file mode 100644
index f8e4e5bf296..00000000000
--- a/_indicators/es/5-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.6.2
-language: es
-layout: indicator
-permalink: /es/5-6-2/
----
\ No newline at end of file
diff --git a/_indicators/es/5-a-1.md b/_indicators/es/5-a-1.md
deleted file mode 100644
index 5d0305d7b95..00000000000
--- a/_indicators/es/5-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.a.1
-language: es
-layout: indicator
-permalink: /es/5-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-a-2.md b/_indicators/es/5-a-2.md
deleted file mode 100644
index 7e170268ad4..00000000000
--- a/_indicators/es/5-a-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.a.2
-language: es
-layout: indicator
-permalink: /es/5-a-2/
----
\ No newline at end of file
diff --git a/_indicators/es/5-b-1.md b/_indicators/es/5-b-1.md
deleted file mode 100644
index ae962119f77..00000000000
--- a/_indicators/es/5-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.b.1
-language: es
-layout: indicator
-permalink: /es/5-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/5-c-1.md b/_indicators/es/5-c-1.md
deleted file mode 100644
index 674a0e33e41..00000000000
--- a/_indicators/es/5-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.c.1
-language: es
-layout: indicator
-permalink: /es/5-c-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-1-1.md b/_indicators/es/6-1-1.md
deleted file mode 100644
index 3f7f62d7464..00000000000
--- a/_indicators/es/6-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.1.1
-language: es
-layout: indicator
-permalink: /es/6-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-2-1.md b/_indicators/es/6-2-1.md
deleted file mode 100644
index 51f54dc7d1b..00000000000
--- a/_indicators/es/6-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.2.1
-language: es
-layout: indicator
-permalink: /es/6-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-3-1.md b/_indicators/es/6-3-1.md
deleted file mode 100644
index 560b7dfa64e..00000000000
--- a/_indicators/es/6-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.3.1
-language: es
-layout: indicator
-permalink: /es/6-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-3-2.md b/_indicators/es/6-3-2.md
deleted file mode 100644
index a0803deb170..00000000000
--- a/_indicators/es/6-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.3.2
-language: es
-layout: indicator
-permalink: /es/6-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/6-4-1.md b/_indicators/es/6-4-1.md
deleted file mode 100644
index 695912390a6..00000000000
--- a/_indicators/es/6-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.4.1
-language: es
-layout: indicator
-permalink: /es/6-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-4-2.md b/_indicators/es/6-4-2.md
deleted file mode 100644
index 197974c3428..00000000000
--- a/_indicators/es/6-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.4.2
-language: es
-layout: indicator
-permalink: /es/6-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/6-5-1.md b/_indicators/es/6-5-1.md
deleted file mode 100644
index d8c43b90d67..00000000000
--- a/_indicators/es/6-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.5.1
-language: es
-layout: indicator
-permalink: /es/6-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-5-2.md b/_indicators/es/6-5-2.md
deleted file mode 100644
index bc1ed4947a4..00000000000
--- a/_indicators/es/6-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.5.2
-language: es
-layout: indicator
-permalink: /es/6-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/6-6-1.md b/_indicators/es/6-6-1.md
deleted file mode 100644
index 3af43c4418d..00000000000
--- a/_indicators/es/6-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.6.1
-language: es
-layout: indicator
-permalink: /es/6-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-a-1.md b/_indicators/es/6-a-1.md
deleted file mode 100644
index ce3d431e1d1..00000000000
--- a/_indicators/es/6-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.a.1
-language: es
-layout: indicator
-permalink: /es/6-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/6-b-1.md b/_indicators/es/6-b-1.md
deleted file mode 100644
index e88eb632a23..00000000000
--- a/_indicators/es/6-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.b.1
-language: es
-layout: indicator
-permalink: /es/6-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/7-1-1.md b/_indicators/es/7-1-1.md
deleted file mode 100644
index d3383d4fbcf..00000000000
--- a/_indicators/es/7-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.1.1
-language: es
-layout: indicator
-permalink: /es/7-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/7-1-2.md b/_indicators/es/7-1-2.md
deleted file mode 100644
index 5e4dd3953e0..00000000000
--- a/_indicators/es/7-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.1.2
-language: es
-layout: indicator
-permalink: /es/7-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/7-2-1.md b/_indicators/es/7-2-1.md
deleted file mode 100644
index f491a8a3cb4..00000000000
--- a/_indicators/es/7-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.2.1
-language: es
-layout: indicator
-permalink: /es/7-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/7-3-1.md b/_indicators/es/7-3-1.md
deleted file mode 100644
index 6ed1ad2eb14..00000000000
--- a/_indicators/es/7-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.3.1
-language: es
-layout: indicator
-permalink: /es/7-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/7-a-1.md b/_indicators/es/7-a-1.md
deleted file mode 100644
index 89b3ab2578e..00000000000
--- a/_indicators/es/7-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.a.1
-language: es
-layout: indicator
-permalink: /es/7-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/7-b-1.md b/_indicators/es/7-b-1.md
deleted file mode 100644
index 26df8f596c1..00000000000
--- a/_indicators/es/7-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.b.1
-language: es
-layout: indicator
-permalink: /es/7-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-1-1.md b/_indicators/es/8-1-1.md
deleted file mode 100644
index 8b36cfe6fae..00000000000
--- a/_indicators/es/8-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.1.1
-language: es
-layout: indicator
-permalink: /es/8-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-10-1.md b/_indicators/es/8-10-1.md
deleted file mode 100644
index a6df8c0add5..00000000000
--- a/_indicators/es/8-10-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.10.1
-language: es
-layout: indicator
-permalink: /es/8-10-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-10-2.md b/_indicators/es/8-10-2.md
deleted file mode 100644
index acf53e07315..00000000000
--- a/_indicators/es/8-10-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.10.2
-language: es
-layout: indicator
-permalink: /es/8-10-2/
----
\ No newline at end of file
diff --git a/_indicators/es/8-2-1.md b/_indicators/es/8-2-1.md
deleted file mode 100644
index c5dc83f349d..00000000000
--- a/_indicators/es/8-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.2.1
-language: es
-layout: indicator
-permalink: /es/8-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-3-1.md b/_indicators/es/8-3-1.md
deleted file mode 100644
index 611a2da1074..00000000000
--- a/_indicators/es/8-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.3.1
-language: es
-layout: indicator
-permalink: /es/8-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-4-1.md b/_indicators/es/8-4-1.md
deleted file mode 100644
index 11ab6dcbd0d..00000000000
--- a/_indicators/es/8-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.4.1
-language: es
-layout: indicator
-permalink: /es/8-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-4-2.md b/_indicators/es/8-4-2.md
deleted file mode 100644
index 372c0763f46..00000000000
--- a/_indicators/es/8-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.4.2
-language: es
-layout: indicator
-permalink: /es/8-4-2/
----
\ No newline at end of file
diff --git a/_indicators/es/8-5-1.md b/_indicators/es/8-5-1.md
deleted file mode 100644
index 16652b6f5da..00000000000
--- a/_indicators/es/8-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.5.1
-language: es
-layout: indicator
-permalink: /es/8-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-5-2.md b/_indicators/es/8-5-2.md
deleted file mode 100644
index d657632cfca..00000000000
--- a/_indicators/es/8-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.5.2
-language: es
-layout: indicator
-permalink: /es/8-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/8-6-1.md b/_indicators/es/8-6-1.md
deleted file mode 100644
index 471dadc41ae..00000000000
--- a/_indicators/es/8-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.6.1
-language: es
-layout: indicator
-permalink: /es/8-6-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-7-1.md b/_indicators/es/8-7-1.md
deleted file mode 100644
index 59c4bb95cef..00000000000
--- a/_indicators/es/8-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.7.1
-language: es
-layout: indicator
-permalink: /es/8-7-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-8-1.md b/_indicators/es/8-8-1.md
deleted file mode 100644
index 4851c482750..00000000000
--- a/_indicators/es/8-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.8.1
-language: es
-layout: indicator
-permalink: /es/8-8-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-8-2.md b/_indicators/es/8-8-2.md
deleted file mode 100644
index 5a353babb95..00000000000
--- a/_indicators/es/8-8-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.8.2
-language: es
-layout: indicator
-permalink: /es/8-8-2/
----
\ No newline at end of file
diff --git a/_indicators/es/8-9-1.md b/_indicators/es/8-9-1.md
deleted file mode 100644
index 5558cb82380..00000000000
--- a/_indicators/es/8-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.9.1
-language: es
-layout: indicator
-permalink: /es/8-9-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-9-2.md b/_indicators/es/8-9-2.md
deleted file mode 100644
index 11aee31f5df..00000000000
--- a/_indicators/es/8-9-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.9.2
-language: es
-layout: indicator
-permalink: /es/8-9-2/
----
\ No newline at end of file
diff --git a/_indicators/es/8-a-1.md b/_indicators/es/8-a-1.md
deleted file mode 100644
index 067f13a6153..00000000000
--- a/_indicators/es/8-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.a.1
-language: es
-layout: indicator
-permalink: /es/8-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/8-b-1.md b/_indicators/es/8-b-1.md
deleted file mode 100644
index 3ca20e73bb6..00000000000
--- a/_indicators/es/8-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.b.1
-language: es
-layout: indicator
-permalink: /es/8-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-1-1.md b/_indicators/es/9-1-1.md
deleted file mode 100644
index 05f2de61b17..00000000000
--- a/_indicators/es/9-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.1.1
-language: es
-layout: indicator
-permalink: /es/9-1-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-1-2.md b/_indicators/es/9-1-2.md
deleted file mode 100644
index 8b9db76eeac..00000000000
--- a/_indicators/es/9-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.1.2
-language: es
-layout: indicator
-permalink: /es/9-1-2/
----
\ No newline at end of file
diff --git a/_indicators/es/9-2-1.md b/_indicators/es/9-2-1.md
deleted file mode 100644
index e2656982a35..00000000000
--- a/_indicators/es/9-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.2.1
-language: es
-layout: indicator
-permalink: /es/9-2-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-2-2.md b/_indicators/es/9-2-2.md
deleted file mode 100644
index 308fb1ff5b8..00000000000
--- a/_indicators/es/9-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.2.2
-language: es
-layout: indicator
-permalink: /es/9-2-2/
----
\ No newline at end of file
diff --git a/_indicators/es/9-3-1.md b/_indicators/es/9-3-1.md
deleted file mode 100644
index a0890f87ced..00000000000
--- a/_indicators/es/9-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.3.1
-language: es
-layout: indicator
-permalink: /es/9-3-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-3-2.md b/_indicators/es/9-3-2.md
deleted file mode 100644
index 3f7e105648b..00000000000
--- a/_indicators/es/9-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.3.2
-language: es
-layout: indicator
-permalink: /es/9-3-2/
----
\ No newline at end of file
diff --git a/_indicators/es/9-4-1.md b/_indicators/es/9-4-1.md
deleted file mode 100644
index 23dd75718b3..00000000000
--- a/_indicators/es/9-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.4.1
-language: es
-layout: indicator
-permalink: /es/9-4-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-5-1.md b/_indicators/es/9-5-1.md
deleted file mode 100644
index 808d298adb9..00000000000
--- a/_indicators/es/9-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.5.1
-language: es
-layout: indicator
-permalink: /es/9-5-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-5-2.md b/_indicators/es/9-5-2.md
deleted file mode 100644
index 0cc4f8de68f..00000000000
--- a/_indicators/es/9-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.5.2
-language: es
-layout: indicator
-permalink: /es/9-5-2/
----
\ No newline at end of file
diff --git a/_indicators/es/9-a-1.md b/_indicators/es/9-a-1.md
deleted file mode 100644
index 11c0d0d1b86..00000000000
--- a/_indicators/es/9-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.a.1
-language: es
-layout: indicator
-permalink: /es/9-a-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-b-1.md b/_indicators/es/9-b-1.md
deleted file mode 100644
index 014a24e7cc7..00000000000
--- a/_indicators/es/9-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.b.1
-language: es
-layout: indicator
-permalink: /es/9-b-1/
----
\ No newline at end of file
diff --git a/_indicators/es/9-c-1.md b/_indicators/es/9-c-1.md
deleted file mode 100644
index 20a7411d189..00000000000
--- a/_indicators/es/9-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.c.1
-language: es
-layout: indicator
-permalink: /es/9-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-1-1.md b/_indicators/fr/1-1-1.md
deleted file mode 100644
index 4ba9968559d..00000000000
--- a/_indicators/fr/1-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.1.1
-language: fr
-layout: indicator
-permalink: /fr/1-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-2-1.md b/_indicators/fr/1-2-1.md
deleted file mode 100644
index e37ff3d4a77..00000000000
--- a/_indicators/fr/1-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.2.1
-language: fr
-layout: indicator
-permalink: /fr/1-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-2-2.md b/_indicators/fr/1-2-2.md
deleted file mode 100644
index 4c0aae3bc32..00000000000
--- a/_indicators/fr/1-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.2.2
-language: fr
-layout: indicator
-permalink: /fr/1-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-3-1.md b/_indicators/fr/1-3-1.md
deleted file mode 100644
index 8cdda4a8337..00000000000
--- a/_indicators/fr/1-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.3.1
-language: fr
-layout: indicator
-permalink: /fr/1-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-4-1.md b/_indicators/fr/1-4-1.md
deleted file mode 100644
index 78693cb6991..00000000000
--- a/_indicators/fr/1-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.4.1
-language: fr
-layout: indicator
-permalink: /fr/1-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-4-2.md b/_indicators/fr/1-4-2.md
deleted file mode 100644
index a7427749f9d..00000000000
--- a/_indicators/fr/1-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.4.2
-language: fr
-layout: indicator
-permalink: /fr/1-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-5-1.md b/_indicators/fr/1-5-1.md
deleted file mode 100644
index 4348379f30d..00000000000
--- a/_indicators/fr/1-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.1
-language: fr
-layout: indicator
-permalink: /fr/1-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-5-2.md b/_indicators/fr/1-5-2.md
deleted file mode 100644
index 53f5c737898..00000000000
--- a/_indicators/fr/1-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.2
-language: fr
-layout: indicator
-permalink: /fr/1-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-5-3.md b/_indicators/fr/1-5-3.md
deleted file mode 100644
index 42f65105a57..00000000000
--- a/_indicators/fr/1-5-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.3
-language: fr
-layout: indicator
-permalink: /fr/1-5-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-5-4.md b/_indicators/fr/1-5-4.md
deleted file mode 100644
index af8f1ec9ae0..00000000000
--- a/_indicators/fr/1-5-4.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.5.4
-language: fr
-layout: indicator
-permalink: /fr/1-5-4/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-a-1.md b/_indicators/fr/1-a-1.md
deleted file mode 100644
index 4ae2f237f30..00000000000
--- a/_indicators/fr/1-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.a.1
-language: fr
-layout: indicator
-permalink: /fr/1-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-a-2.md b/_indicators/fr/1-a-2.md
deleted file mode 100644
index 964e5b811c2..00000000000
--- a/_indicators/fr/1-a-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.a.2
-language: fr
-layout: indicator
-permalink: /fr/1-a-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-a-3.md b/_indicators/fr/1-a-3.md
deleted file mode 100644
index fc9667cf5d4..00000000000
--- a/_indicators/fr/1-a-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.a.3
-language: fr
-layout: indicator
-permalink: /fr/1-a-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/1-b-1.md b/_indicators/fr/1-b-1.md
deleted file mode 100644
index b457f73ce2f..00000000000
--- a/_indicators/fr/1-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 1.b.1
-language: fr
-layout: indicator
-permalink: /fr/1-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-1-1.md b/_indicators/fr/10-1-1.md
deleted file mode 100644
index e9d9422a0c4..00000000000
--- a/_indicators/fr/10-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.1.1
-language: fr
-layout: indicator
-permalink: /fr/10-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-2-1.md b/_indicators/fr/10-2-1.md
deleted file mode 100644
index e4ee5d3310a..00000000000
--- a/_indicators/fr/10-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.2.1
-language: fr
-layout: indicator
-permalink: /fr/10-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-3-1.md b/_indicators/fr/10-3-1.md
deleted file mode 100644
index ad8180800bf..00000000000
--- a/_indicators/fr/10-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.3.1
-language: fr
-layout: indicator
-permalink: /fr/10-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-4-1.md b/_indicators/fr/10-4-1.md
deleted file mode 100644
index 0333917435d..00000000000
--- a/_indicators/fr/10-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.4.1
-language: fr
-layout: indicator
-permalink: /fr/10-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-5-1.md b/_indicators/fr/10-5-1.md
deleted file mode 100644
index 19c37104596..00000000000
--- a/_indicators/fr/10-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.5.1
-language: fr
-layout: indicator
-permalink: /fr/10-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-6-1.md b/_indicators/fr/10-6-1.md
deleted file mode 100644
index b2f48250cc1..00000000000
--- a/_indicators/fr/10-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.6.1
-language: fr
-layout: indicator
-permalink: /fr/10-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-7-1.md b/_indicators/fr/10-7-1.md
deleted file mode 100644
index d19aac4697d..00000000000
--- a/_indicators/fr/10-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.7.1
-language: fr
-layout: indicator
-permalink: /fr/10-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-7-2.md b/_indicators/fr/10-7-2.md
deleted file mode 100644
index 0e421ae1497..00000000000
--- a/_indicators/fr/10-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.7.2
-language: fr
-layout: indicator
-permalink: /fr/10-7-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-a-1.md b/_indicators/fr/10-a-1.md
deleted file mode 100644
index 7074bd9efcd..00000000000
--- a/_indicators/fr/10-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.a.1
-language: fr
-layout: indicator
-permalink: /fr/10-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-b-1.md b/_indicators/fr/10-b-1.md
deleted file mode 100644
index a4dd1689fd9..00000000000
--- a/_indicators/fr/10-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.b.1
-language: fr
-layout: indicator
-permalink: /fr/10-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/10-c-1.md b/_indicators/fr/10-c-1.md
deleted file mode 100644
index de39f3ee34d..00000000000
--- a/_indicators/fr/10-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 10.c.1
-language: fr
-layout: indicator
-permalink: /fr/10-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-1-1.md b/_indicators/fr/11-1-1.md
deleted file mode 100644
index ef47f41be1f..00000000000
--- a/_indicators/fr/11-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.1.1
-language: fr
-layout: indicator
-permalink: /fr/11-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-2-1.md b/_indicators/fr/11-2-1.md
deleted file mode 100644
index 8b252efe177..00000000000
--- a/_indicators/fr/11-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.2.1
-language: fr
-layout: indicator
-permalink: /fr/11-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-3-1.md b/_indicators/fr/11-3-1.md
deleted file mode 100644
index 90532d8b192..00000000000
--- a/_indicators/fr/11-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.3.1
-language: fr
-layout: indicator
-permalink: /fr/11-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-3-2.md b/_indicators/fr/11-3-2.md
deleted file mode 100644
index 97e6426f5be..00000000000
--- a/_indicators/fr/11-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.3.2
-language: fr
-layout: indicator
-permalink: /fr/11-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-4-1.md b/_indicators/fr/11-4-1.md
deleted file mode 100644
index b22af9caa40..00000000000
--- a/_indicators/fr/11-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.4.1
-language: fr
-layout: indicator
-permalink: /fr/11-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-5-1.md b/_indicators/fr/11-5-1.md
deleted file mode 100644
index c51dc5d1dae..00000000000
--- a/_indicators/fr/11-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.5.1
-language: fr
-layout: indicator
-permalink: /fr/11-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-5-2.md b/_indicators/fr/11-5-2.md
deleted file mode 100644
index fe8ba24a5f6..00000000000
--- a/_indicators/fr/11-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.5.2
-language: fr
-layout: indicator
-permalink: /fr/11-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-6-1.md b/_indicators/fr/11-6-1.md
deleted file mode 100644
index df576d06da0..00000000000
--- a/_indicators/fr/11-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.6.1
-language: fr
-layout: indicator
-permalink: /fr/11-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-6-2.md b/_indicators/fr/11-6-2.md
deleted file mode 100644
index 422d39ea01c..00000000000
--- a/_indicators/fr/11-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.6.2
-language: fr
-layout: indicator
-permalink: /fr/11-6-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-7-1.md b/_indicators/fr/11-7-1.md
deleted file mode 100644
index 34ac7a64a67..00000000000
--- a/_indicators/fr/11-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.7.1
-language: fr
-layout: indicator
-permalink: /fr/11-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-7-2.md b/_indicators/fr/11-7-2.md
deleted file mode 100644
index a34d68beda0..00000000000
--- a/_indicators/fr/11-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.7.2
-language: fr
-layout: indicator
-permalink: /fr/11-7-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-a-1.md b/_indicators/fr/11-a-1.md
deleted file mode 100644
index 68ea110fe64..00000000000
--- a/_indicators/fr/11-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.a.1
-language: fr
-layout: indicator
-permalink: /fr/11-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-b-1.md b/_indicators/fr/11-b-1.md
deleted file mode 100644
index 81f13cae303..00000000000
--- a/_indicators/fr/11-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.b.1
-language: fr
-layout: indicator
-permalink: /fr/11-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-b-2.md b/_indicators/fr/11-b-2.md
deleted file mode 100644
index e0e190329b6..00000000000
--- a/_indicators/fr/11-b-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.b.2
-language: fr
-layout: indicator
-permalink: /fr/11-b-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/11-c-1.md b/_indicators/fr/11-c-1.md
deleted file mode 100644
index f48df683b15..00000000000
--- a/_indicators/fr/11-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 11.c.1
-language: fr
-layout: indicator
-permalink: /fr/11-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-1-1.md b/_indicators/fr/12-1-1.md
deleted file mode 100644
index 5cc9d2bab72..00000000000
--- a/_indicators/fr/12-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.1.1
-language: fr
-layout: indicator
-permalink: /fr/12-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-2-1.md b/_indicators/fr/12-2-1.md
deleted file mode 100644
index 71bb1c27fb1..00000000000
--- a/_indicators/fr/12-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.2.1
-language: fr
-layout: indicator
-permalink: /fr/12-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-2-2.md b/_indicators/fr/12-2-2.md
deleted file mode 100644
index 3b0303cbdb4..00000000000
--- a/_indicators/fr/12-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.2.2
-language: fr
-layout: indicator
-permalink: /fr/12-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-3-1.md b/_indicators/fr/12-3-1.md
deleted file mode 100644
index 48d3ea7dcd6..00000000000
--- a/_indicators/fr/12-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.3.1
-language: fr
-layout: indicator
-permalink: /fr/12-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-4-1.md b/_indicators/fr/12-4-1.md
deleted file mode 100644
index 3104214066f..00000000000
--- a/_indicators/fr/12-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.4.1
-language: fr
-layout: indicator
-permalink: /fr/12-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-4-2.md b/_indicators/fr/12-4-2.md
deleted file mode 100644
index 3a32e1a71f7..00000000000
--- a/_indicators/fr/12-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.4.2
-language: fr
-layout: indicator
-permalink: /fr/12-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-5-1.md b/_indicators/fr/12-5-1.md
deleted file mode 100644
index 860c138be70..00000000000
--- a/_indicators/fr/12-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.5.1
-language: fr
-layout: indicator
-permalink: /fr/12-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-6-1.md b/_indicators/fr/12-6-1.md
deleted file mode 100644
index cdacee12088..00000000000
--- a/_indicators/fr/12-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.6.1
-language: fr
-layout: indicator
-permalink: /fr/12-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-7-1.md b/_indicators/fr/12-7-1.md
deleted file mode 100644
index 75b785884c3..00000000000
--- a/_indicators/fr/12-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.7.1
-language: fr
-layout: indicator
-permalink: /fr/12-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-8-1.md b/_indicators/fr/12-8-1.md
deleted file mode 100644
index e50470e0f68..00000000000
--- a/_indicators/fr/12-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.8.1
-language: fr
-layout: indicator
-permalink: /fr/12-8-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-a-1.md b/_indicators/fr/12-a-1.md
deleted file mode 100644
index 817d156cfc8..00000000000
--- a/_indicators/fr/12-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.a.1
-language: fr
-layout: indicator
-permalink: /fr/12-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-b-1.md b/_indicators/fr/12-b-1.md
deleted file mode 100644
index 0d1bd3c6e9b..00000000000
--- a/_indicators/fr/12-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.b.1
-language: fr
-layout: indicator
-permalink: /fr/12-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/12-c-1.md b/_indicators/fr/12-c-1.md
deleted file mode 100644
index 86c02c60c10..00000000000
--- a/_indicators/fr/12-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 12.c.1
-language: fr
-layout: indicator
-permalink: /fr/12-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-1-1.md b/_indicators/fr/13-1-1.md
deleted file mode 100644
index 7c238f3684b..00000000000
--- a/_indicators/fr/13-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.1.1
-language: fr
-layout: indicator
-permalink: /fr/13-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-1-2.md b/_indicators/fr/13-1-2.md
deleted file mode 100644
index 8ed1449a4c0..00000000000
--- a/_indicators/fr/13-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.1.2
-language: fr
-layout: indicator
-permalink: /fr/13-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-1-3.md b/_indicators/fr/13-1-3.md
deleted file mode 100644
index 0879471f58b..00000000000
--- a/_indicators/fr/13-1-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.1.3
-language: fr
-layout: indicator
-permalink: /fr/13-1-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-2-1.md b/_indicators/fr/13-2-1.md
deleted file mode 100644
index 37864d78736..00000000000
--- a/_indicators/fr/13-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.2.1
-language: fr
-layout: indicator
-permalink: /fr/13-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-3-1.md b/_indicators/fr/13-3-1.md
deleted file mode 100644
index ead295989aa..00000000000
--- a/_indicators/fr/13-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.3.1
-language: fr
-layout: indicator
-permalink: /fr/13-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-3-2.md b/_indicators/fr/13-3-2.md
deleted file mode 100644
index 1dcd88b9b43..00000000000
--- a/_indicators/fr/13-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.3.2
-language: fr
-layout: indicator
-permalink: /fr/13-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-a-1.md b/_indicators/fr/13-a-1.md
deleted file mode 100644
index 2a0038eb6cc..00000000000
--- a/_indicators/fr/13-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.a.1
-language: fr
-layout: indicator
-permalink: /fr/13-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/13-b-1.md b/_indicators/fr/13-b-1.md
deleted file mode 100644
index c6af0f12706..00000000000
--- a/_indicators/fr/13-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 13.b.1
-language: fr
-layout: indicator
-permalink: /fr/13-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-1-1.md b/_indicators/fr/14-1-1.md
deleted file mode 100644
index 0580b6443d2..00000000000
--- a/_indicators/fr/14-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.1.1
-language: fr
-layout: indicator
-permalink: /fr/14-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-2-1.md b/_indicators/fr/14-2-1.md
deleted file mode 100644
index f32cda20ed1..00000000000
--- a/_indicators/fr/14-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.2.1
-language: fr
-layout: indicator
-permalink: /fr/14-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-3-1.md b/_indicators/fr/14-3-1.md
deleted file mode 100644
index 9ac8b9352a7..00000000000
--- a/_indicators/fr/14-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.3.1
-language: fr
-layout: indicator
-permalink: /fr/14-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-4-1.md b/_indicators/fr/14-4-1.md
deleted file mode 100644
index 191fdca229a..00000000000
--- a/_indicators/fr/14-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.4.1
-language: fr
-layout: indicator
-permalink: /fr/14-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-5-1.md b/_indicators/fr/14-5-1.md
deleted file mode 100644
index b7cb01c0c8c..00000000000
--- a/_indicators/fr/14-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.5.1
-language: fr
-layout: indicator
-permalink: /fr/14-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-6-1.md b/_indicators/fr/14-6-1.md
deleted file mode 100644
index 4700a986f6e..00000000000
--- a/_indicators/fr/14-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.6.1
-language: fr
-layout: indicator
-permalink: /fr/14-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-7-1.md b/_indicators/fr/14-7-1.md
deleted file mode 100644
index 00062fab3bf..00000000000
--- a/_indicators/fr/14-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.7.1
-language: fr
-layout: indicator
-permalink: /fr/14-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-a-1.md b/_indicators/fr/14-a-1.md
deleted file mode 100644
index 0c9ad87d848..00000000000
--- a/_indicators/fr/14-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.a.1
-language: fr
-layout: indicator
-permalink: /fr/14-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-b-1.md b/_indicators/fr/14-b-1.md
deleted file mode 100644
index 897d15504e7..00000000000
--- a/_indicators/fr/14-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.b.1
-language: fr
-layout: indicator
-permalink: /fr/14-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/14-c-1.md b/_indicators/fr/14-c-1.md
deleted file mode 100644
index d443d66defc..00000000000
--- a/_indicators/fr/14-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 14.c.1
-language: fr
-layout: indicator
-permalink: /fr/14-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-1-1.md b/_indicators/fr/15-1-1.md
deleted file mode 100644
index 79f0161af39..00000000000
--- a/_indicators/fr/15-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.1.1
-language: fr
-layout: indicator
-permalink: /fr/15-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-1-2.md b/_indicators/fr/15-1-2.md
deleted file mode 100644
index a379edb6be4..00000000000
--- a/_indicators/fr/15-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.1.2
-language: fr
-layout: indicator
-permalink: /fr/15-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-2-1.md b/_indicators/fr/15-2-1.md
deleted file mode 100644
index 5ea098eb897..00000000000
--- a/_indicators/fr/15-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.2.1
-language: fr
-layout: indicator
-permalink: /fr/15-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-3-1.md b/_indicators/fr/15-3-1.md
deleted file mode 100644
index 5a9debddc37..00000000000
--- a/_indicators/fr/15-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.3.1
-language: fr
-layout: indicator
-permalink: /fr/15-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-4-1.md b/_indicators/fr/15-4-1.md
deleted file mode 100644
index 3b35f214d59..00000000000
--- a/_indicators/fr/15-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.4.1
-language: fr
-layout: indicator
-permalink: /fr/15-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-4-2.md b/_indicators/fr/15-4-2.md
deleted file mode 100644
index 2a2dcc2fe4d..00000000000
--- a/_indicators/fr/15-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.4.2
-language: fr
-layout: indicator
-permalink: /fr/15-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-5-1.md b/_indicators/fr/15-5-1.md
deleted file mode 100644
index 1d26dbe7004..00000000000
--- a/_indicators/fr/15-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.5.1
-language: fr
-layout: indicator
-permalink: /fr/15-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-6-1.md b/_indicators/fr/15-6-1.md
deleted file mode 100644
index 148a85327c7..00000000000
--- a/_indicators/fr/15-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.6.1
-language: fr
-layout: indicator
-permalink: /fr/15-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-7-1.md b/_indicators/fr/15-7-1.md
deleted file mode 100644
index 08ac189166e..00000000000
--- a/_indicators/fr/15-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.7.1
-language: fr
-layout: indicator
-permalink: /fr/15-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-8-1.md b/_indicators/fr/15-8-1.md
deleted file mode 100644
index a446734ea42..00000000000
--- a/_indicators/fr/15-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.8.1
-language: fr
-layout: indicator
-permalink: /fr/15-8-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-9-1.md b/_indicators/fr/15-9-1.md
deleted file mode 100644
index e507f2a6cd1..00000000000
--- a/_indicators/fr/15-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.9.1
-language: fr
-layout: indicator
-permalink: /fr/15-9-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-a-1.md b/_indicators/fr/15-a-1.md
deleted file mode 100644
index 19dc61d2301..00000000000
--- a/_indicators/fr/15-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.a.1
-language: fr
-layout: indicator
-permalink: /fr/15-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-b-1.md b/_indicators/fr/15-b-1.md
deleted file mode 100644
index 5b306361de5..00000000000
--- a/_indicators/fr/15-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.b.1
-language: fr
-layout: indicator
-permalink: /fr/15-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/15-c-1.md b/_indicators/fr/15-c-1.md
deleted file mode 100644
index 825983a8da0..00000000000
--- a/_indicators/fr/15-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 15.c.1
-language: fr
-layout: indicator
-permalink: /fr/15-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-1-1.md b/_indicators/fr/16-1-1.md
deleted file mode 100644
index 9823ead7c17..00000000000
--- a/_indicators/fr/16-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.1
-language: fr
-layout: indicator
-permalink: /fr/16-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-1-2.md b/_indicators/fr/16-1-2.md
deleted file mode 100644
index 9d5f6ad00be..00000000000
--- a/_indicators/fr/16-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.2
-language: fr
-layout: indicator
-permalink: /fr/16-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-1-3.md b/_indicators/fr/16-1-3.md
deleted file mode 100644
index 7e84990c0f2..00000000000
--- a/_indicators/fr/16-1-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.3
-language: fr
-layout: indicator
-permalink: /fr/16-1-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-1-4.md b/_indicators/fr/16-1-4.md
deleted file mode 100644
index 3321d7dfd73..00000000000
--- a/_indicators/fr/16-1-4.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.1.4
-language: fr
-layout: indicator
-permalink: /fr/16-1-4/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-10-1.md b/_indicators/fr/16-10-1.md
deleted file mode 100644
index 76fc9c497a1..00000000000
--- a/_indicators/fr/16-10-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.10.1
-language: fr
-layout: indicator
-permalink: /fr/16-10-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-10-2.md b/_indicators/fr/16-10-2.md
deleted file mode 100644
index ad01d6180d2..00000000000
--- a/_indicators/fr/16-10-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.10.2
-language: fr
-layout: indicator
-permalink: /fr/16-10-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-2-1.md b/_indicators/fr/16-2-1.md
deleted file mode 100644
index 2f76c45721a..00000000000
--- a/_indicators/fr/16-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.2.1
-language: fr
-layout: indicator
-permalink: /fr/16-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-2-2.md b/_indicators/fr/16-2-2.md
deleted file mode 100644
index c420147cf3b..00000000000
--- a/_indicators/fr/16-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.2.2
-language: fr
-layout: indicator
-permalink: /fr/16-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-2-3.md b/_indicators/fr/16-2-3.md
deleted file mode 100644
index 4415b247cc9..00000000000
--- a/_indicators/fr/16-2-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.2.3
-language: fr
-layout: indicator
-permalink: /fr/16-2-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-3-1.md b/_indicators/fr/16-3-1.md
deleted file mode 100644
index 2b7666d3a39..00000000000
--- a/_indicators/fr/16-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.3.1
-language: fr
-layout: indicator
-permalink: /fr/16-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-3-2.md b/_indicators/fr/16-3-2.md
deleted file mode 100644
index 3cc73a5f077..00000000000
--- a/_indicators/fr/16-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.3.2
-language: fr
-layout: indicator
-permalink: /fr/16-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-4-1.md b/_indicators/fr/16-4-1.md
deleted file mode 100644
index dedb06dde51..00000000000
--- a/_indicators/fr/16-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.4.1
-language: fr
-layout: indicator
-permalink: /fr/16-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-4-2.md b/_indicators/fr/16-4-2.md
deleted file mode 100644
index 15c51178127..00000000000
--- a/_indicators/fr/16-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.4.2
-language: fr
-layout: indicator
-permalink: /fr/16-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-5-1.md b/_indicators/fr/16-5-1.md
deleted file mode 100644
index da966243c1a..00000000000
--- a/_indicators/fr/16-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.5.1
-language: fr
-layout: indicator
-permalink: /fr/16-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-5-2.md b/_indicators/fr/16-5-2.md
deleted file mode 100644
index cf6db82ba83..00000000000
--- a/_indicators/fr/16-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.5.2
-language: fr
-layout: indicator
-permalink: /fr/16-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-6-1.md b/_indicators/fr/16-6-1.md
deleted file mode 100644
index 471bd4890b9..00000000000
--- a/_indicators/fr/16-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.6.1
-language: fr
-layout: indicator
-permalink: /fr/16-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-6-2.md b/_indicators/fr/16-6-2.md
deleted file mode 100644
index e1c6e99a844..00000000000
--- a/_indicators/fr/16-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.6.2
-language: fr
-layout: indicator
-permalink: /fr/16-6-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-7-1.md b/_indicators/fr/16-7-1.md
deleted file mode 100644
index 8459b49f999..00000000000
--- a/_indicators/fr/16-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.7.1
-language: fr
-layout: indicator
-permalink: /fr/16-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-7-2.md b/_indicators/fr/16-7-2.md
deleted file mode 100644
index 90dfdc993ad..00000000000
--- a/_indicators/fr/16-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.7.2
-language: fr
-layout: indicator
-permalink: /fr/16-7-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-8-1.md b/_indicators/fr/16-8-1.md
deleted file mode 100644
index 087fb8be256..00000000000
--- a/_indicators/fr/16-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.8.1
-language: fr
-layout: indicator
-permalink: /fr/16-8-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-9-1.md b/_indicators/fr/16-9-1.md
deleted file mode 100644
index 5398acf5486..00000000000
--- a/_indicators/fr/16-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.9.1
-language: fr
-layout: indicator
-permalink: /fr/16-9-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-a-1.md b/_indicators/fr/16-a-1.md
deleted file mode 100644
index 10a83a8dc3c..00000000000
--- a/_indicators/fr/16-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.a.1
-language: fr
-layout: indicator
-permalink: /fr/16-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/16-b-1.md b/_indicators/fr/16-b-1.md
deleted file mode 100644
index b66936dab27..00000000000
--- a/_indicators/fr/16-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 16.b.1
-language: fr
-layout: indicator
-permalink: /fr/16-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-1-1.md b/_indicators/fr/17-1-1.md
deleted file mode 100644
index 09a523699ca..00000000000
--- a/_indicators/fr/17-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.1.1
-language: fr
-layout: indicator
-permalink: /fr/17-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-1-2.md b/_indicators/fr/17-1-2.md
deleted file mode 100644
index 646f4b7d450..00000000000
--- a/_indicators/fr/17-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.1.2
-language: fr
-layout: indicator
-permalink: /fr/17-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-10-1.md b/_indicators/fr/17-10-1.md
deleted file mode 100644
index 0845582b3fa..00000000000
--- a/_indicators/fr/17-10-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.10.1
-language: fr
-layout: indicator
-permalink: /fr/17-10-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-11-1.md b/_indicators/fr/17-11-1.md
deleted file mode 100644
index 678a843c66c..00000000000
--- a/_indicators/fr/17-11-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.11.1
-language: fr
-layout: indicator
-permalink: /fr/17-11-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-12-1.md b/_indicators/fr/17-12-1.md
deleted file mode 100644
index 6ceed8435a2..00000000000
--- a/_indicators/fr/17-12-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.12.1
-language: fr
-layout: indicator
-permalink: /fr/17-12-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-13-1.md b/_indicators/fr/17-13-1.md
deleted file mode 100644
index b6028985a94..00000000000
--- a/_indicators/fr/17-13-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.13.1
-language: fr
-layout: indicator
-permalink: /fr/17-13-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-14-1.md b/_indicators/fr/17-14-1.md
deleted file mode 100644
index da49684d281..00000000000
--- a/_indicators/fr/17-14-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.14.1
-language: fr
-layout: indicator
-permalink: /fr/17-14-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-15-1.md b/_indicators/fr/17-15-1.md
deleted file mode 100644
index df64066142d..00000000000
--- a/_indicators/fr/17-15-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.15.1
-language: fr
-layout: indicator
-permalink: /fr/17-15-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-16-1.md b/_indicators/fr/17-16-1.md
deleted file mode 100644
index 58b5def192a..00000000000
--- a/_indicators/fr/17-16-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.16.1
-language: fr
-layout: indicator
-permalink: /fr/17-16-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-17-1.md b/_indicators/fr/17-17-1.md
deleted file mode 100644
index 010654b75f8..00000000000
--- a/_indicators/fr/17-17-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.17.1
-language: fr
-layout: indicator
-permalink: /fr/17-17-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-18-1.md b/_indicators/fr/17-18-1.md
deleted file mode 100644
index dbbbf9be448..00000000000
--- a/_indicators/fr/17-18-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.18.1
-language: fr
-layout: indicator
-permalink: /fr/17-18-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-18-2.md b/_indicators/fr/17-18-2.md
deleted file mode 100644
index 4baffeef6d0..00000000000
--- a/_indicators/fr/17-18-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.18.2
-language: fr
-layout: indicator
-permalink: /fr/17-18-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-18-3.md b/_indicators/fr/17-18-3.md
deleted file mode 100644
index 15dbea3b6fb..00000000000
--- a/_indicators/fr/17-18-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.18.3
-language: fr
-layout: indicator
-permalink: /fr/17-18-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-19-1.md b/_indicators/fr/17-19-1.md
deleted file mode 100644
index 90f113952f6..00000000000
--- a/_indicators/fr/17-19-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.19.1
-language: fr
-layout: indicator
-permalink: /fr/17-19-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-19-2.md b/_indicators/fr/17-19-2.md
deleted file mode 100644
index f4df25325ff..00000000000
--- a/_indicators/fr/17-19-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.19.2
-language: fr
-layout: indicator
-permalink: /fr/17-19-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-2-1.md b/_indicators/fr/17-2-1.md
deleted file mode 100644
index 89522684fba..00000000000
--- a/_indicators/fr/17-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.2.1
-language: fr
-layout: indicator
-permalink: /fr/17-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-3-1.md b/_indicators/fr/17-3-1.md
deleted file mode 100644
index 2fc41c07b3d..00000000000
--- a/_indicators/fr/17-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.3.1
-language: fr
-layout: indicator
-permalink: /fr/17-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-3-2.md b/_indicators/fr/17-3-2.md
deleted file mode 100644
index f86e2c852c8..00000000000
--- a/_indicators/fr/17-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.3.2
-language: fr
-layout: indicator
-permalink: /fr/17-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-4-1.md b/_indicators/fr/17-4-1.md
deleted file mode 100644
index 4c9535d837f..00000000000
--- a/_indicators/fr/17-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.4.1
-language: fr
-layout: indicator
-permalink: /fr/17-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-5-1.md b/_indicators/fr/17-5-1.md
deleted file mode 100644
index 8bcf7f55327..00000000000
--- a/_indicators/fr/17-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.5.1
-language: fr
-layout: indicator
-permalink: /fr/17-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-6-1.md b/_indicators/fr/17-6-1.md
deleted file mode 100644
index 636a8682237..00000000000
--- a/_indicators/fr/17-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.6.1
-language: fr
-layout: indicator
-permalink: /fr/17-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-6-2.md b/_indicators/fr/17-6-2.md
deleted file mode 100644
index 24a9a122321..00000000000
--- a/_indicators/fr/17-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.6.2
-language: fr
-layout: indicator
-permalink: /fr/17-6-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-7-1.md b/_indicators/fr/17-7-1.md
deleted file mode 100644
index a850be50418..00000000000
--- a/_indicators/fr/17-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.7.1
-language: fr
-layout: indicator
-permalink: /fr/17-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-8-1.md b/_indicators/fr/17-8-1.md
deleted file mode 100644
index 92c06cebd29..00000000000
--- a/_indicators/fr/17-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.8.1
-language: fr
-layout: indicator
-permalink: /fr/17-8-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/17-9-1.md b/_indicators/fr/17-9-1.md
deleted file mode 100644
index 69e0d12f488..00000000000
--- a/_indicators/fr/17-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 17.9.1
-language: fr
-layout: indicator
-permalink: /fr/17-9-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-1-1.md b/_indicators/fr/2-1-1.md
deleted file mode 100644
index 6fc2bf82a57..00000000000
--- a/_indicators/fr/2-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.1.1
-language: fr
-layout: indicator
-permalink: /fr/2-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-1-2.md b/_indicators/fr/2-1-2.md
deleted file mode 100644
index 2f7b23e34d4..00000000000
--- a/_indicators/fr/2-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.1.2
-language: fr
-layout: indicator
-permalink: /fr/2-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-2-1.md b/_indicators/fr/2-2-1.md
deleted file mode 100644
index 2413aedf43e..00000000000
--- a/_indicators/fr/2-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.2.1
-language: fr
-layout: indicator
-permalink: /fr/2-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-2-2.md b/_indicators/fr/2-2-2.md
deleted file mode 100644
index 33fbdd5e0b1..00000000000
--- a/_indicators/fr/2-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.2.2
-language: fr
-layout: indicator
-permalink: /fr/2-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-3-1.md b/_indicators/fr/2-3-1.md
deleted file mode 100644
index 6a9b43a7ac3..00000000000
--- a/_indicators/fr/2-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.3.1
-language: fr
-layout: indicator
-permalink: /fr/2-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-3-2.md b/_indicators/fr/2-3-2.md
deleted file mode 100644
index 3c42151f9e0..00000000000
--- a/_indicators/fr/2-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.3.2
-language: fr
-layout: indicator
-permalink: /fr/2-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-4-1.md b/_indicators/fr/2-4-1.md
deleted file mode 100644
index 60ac3ea135e..00000000000
--- a/_indicators/fr/2-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.4.1
-language: fr
-layout: indicator
-permalink: /fr/2-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-5-1.md b/_indicators/fr/2-5-1.md
deleted file mode 100644
index ff49ba273ef..00000000000
--- a/_indicators/fr/2-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.5.1
-language: fr
-layout: indicator
-permalink: /fr/2-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-5-2.md b/_indicators/fr/2-5-2.md
deleted file mode 100644
index 2b0c1116c52..00000000000
--- a/_indicators/fr/2-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.5.2
-language: fr
-layout: indicator
-permalink: /fr/2-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-a-1.md b/_indicators/fr/2-a-1.md
deleted file mode 100644
index 019aff37324..00000000000
--- a/_indicators/fr/2-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.a.1
-language: fr
-layout: indicator
-permalink: /fr/2-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-a-2.md b/_indicators/fr/2-a-2.md
deleted file mode 100644
index 540263b6e26..00000000000
--- a/_indicators/fr/2-a-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.a.2
-language: fr
-layout: indicator
-permalink: /fr/2-a-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-b-1.md b/_indicators/fr/2-b-1.md
deleted file mode 100644
index 1e1acb7de5c..00000000000
--- a/_indicators/fr/2-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.b.1
-language: fr
-layout: indicator
-permalink: /fr/2-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/2-c-1.md b/_indicators/fr/2-c-1.md
deleted file mode 100644
index cd3b1bb64b6..00000000000
--- a/_indicators/fr/2-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 2.c.1
-language: fr
-layout: indicator
-permalink: /fr/2-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-1-1.md b/_indicators/fr/3-1-1.md
deleted file mode 100644
index 7cbba6e79b2..00000000000
--- a/_indicators/fr/3-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.1.1
-language: fr
-layout: indicator
-permalink: /fr/3-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-1-2.md b/_indicators/fr/3-1-2.md
deleted file mode 100644
index 988ee82908d..00000000000
--- a/_indicators/fr/3-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.1.2
-language: fr
-layout: indicator
-permalink: /fr/3-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-2-1.md b/_indicators/fr/3-2-1.md
deleted file mode 100644
index 6c01c1863b3..00000000000
--- a/_indicators/fr/3-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.2.1
-language: fr
-layout: indicator
-permalink: /fr/3-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-2-2.md b/_indicators/fr/3-2-2.md
deleted file mode 100644
index a1ca163dd4f..00000000000
--- a/_indicators/fr/3-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.2.2
-language: fr
-layout: indicator
-permalink: /fr/3-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-3-1.md b/_indicators/fr/3-3-1.md
deleted file mode 100644
index dd6f26a2976..00000000000
--- a/_indicators/fr/3-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.1
-language: fr
-layout: indicator
-permalink: /fr/3-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-3-2.md b/_indicators/fr/3-3-2.md
deleted file mode 100644
index b26b3d63857..00000000000
--- a/_indicators/fr/3-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.2
-language: fr
-layout: indicator
-permalink: /fr/3-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-3-3.md b/_indicators/fr/3-3-3.md
deleted file mode 100644
index 42cc1b49049..00000000000
--- a/_indicators/fr/3-3-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.3
-language: fr
-layout: indicator
-permalink: /fr/3-3-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-3-4.md b/_indicators/fr/3-3-4.md
deleted file mode 100644
index 2db39a9ee0a..00000000000
--- a/_indicators/fr/3-3-4.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.4
-language: fr
-layout: indicator
-permalink: /fr/3-3-4/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-3-5.md b/_indicators/fr/3-3-5.md
deleted file mode 100644
index e038a73068d..00000000000
--- a/_indicators/fr/3-3-5.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.3.5
-language: fr
-layout: indicator
-permalink: /fr/3-3-5/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-4-1.md b/_indicators/fr/3-4-1.md
deleted file mode 100644
index 7256b950627..00000000000
--- a/_indicators/fr/3-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.4.1
-language: fr
-layout: indicator
-permalink: /fr/3-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-4-2.md b/_indicators/fr/3-4-2.md
deleted file mode 100644
index 3f80324d653..00000000000
--- a/_indicators/fr/3-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.4.2
-language: fr
-layout: indicator
-permalink: /fr/3-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-5-1.md b/_indicators/fr/3-5-1.md
deleted file mode 100644
index b0e9964ecc1..00000000000
--- a/_indicators/fr/3-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.5.1
-language: fr
-layout: indicator
-permalink: /fr/3-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-5-2.md b/_indicators/fr/3-5-2.md
deleted file mode 100644
index 98ce28ce10d..00000000000
--- a/_indicators/fr/3-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.5.2
-language: fr
-layout: indicator
-permalink: /fr/3-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-6-1.md b/_indicators/fr/3-6-1.md
deleted file mode 100644
index c9847ab0bef..00000000000
--- a/_indicators/fr/3-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.6.1
-language: fr
-layout: indicator
-permalink: /fr/3-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-7-1.md b/_indicators/fr/3-7-1.md
deleted file mode 100644
index 0aab213cef1..00000000000
--- a/_indicators/fr/3-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.7.1
-language: fr
-layout: indicator
-permalink: /fr/3-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-7-2.md b/_indicators/fr/3-7-2.md
deleted file mode 100644
index ce5ea3504b3..00000000000
--- a/_indicators/fr/3-7-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.7.2
-language: fr
-layout: indicator
-permalink: /fr/3-7-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-8-1.md b/_indicators/fr/3-8-1.md
deleted file mode 100644
index 827bf8104ee..00000000000
--- a/_indicators/fr/3-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.8.1
-language: fr
-layout: indicator
-permalink: /fr/3-8-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-8-2.md b/_indicators/fr/3-8-2.md
deleted file mode 100644
index baf66b30393..00000000000
--- a/_indicators/fr/3-8-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.8.2
-language: fr
-layout: indicator
-permalink: /fr/3-8-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-9-1.md b/_indicators/fr/3-9-1.md
deleted file mode 100644
index d426278942e..00000000000
--- a/_indicators/fr/3-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.9.1
-language: fr
-layout: indicator
-permalink: /fr/3-9-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-9-2.md b/_indicators/fr/3-9-2.md
deleted file mode 100644
index 5576ced4fb2..00000000000
--- a/_indicators/fr/3-9-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.9.2
-language: fr
-layout: indicator
-permalink: /fr/3-9-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-9-3.md b/_indicators/fr/3-9-3.md
deleted file mode 100644
index c556f815325..00000000000
--- a/_indicators/fr/3-9-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.9.3
-language: fr
-layout: indicator
-permalink: /fr/3-9-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-a-1.md b/_indicators/fr/3-a-1.md
deleted file mode 100644
index 91169adb371..00000000000
--- a/_indicators/fr/3-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.a.1
-language: fr
-layout: indicator
-permalink: /fr/3-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-b-1.md b/_indicators/fr/3-b-1.md
deleted file mode 100644
index 64dd6a22cec..00000000000
--- a/_indicators/fr/3-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.b.1
-language: fr
-layout: indicator
-permalink: /fr/3-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-b-2.md b/_indicators/fr/3-b-2.md
deleted file mode 100644
index b17aceee014..00000000000
--- a/_indicators/fr/3-b-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.b.2
-language: fr
-layout: indicator
-permalink: /fr/3-b-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-b-3.md b/_indicators/fr/3-b-3.md
deleted file mode 100644
index b5bc15d7fdc..00000000000
--- a/_indicators/fr/3-b-3.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.b.3
-language: fr
-layout: indicator
-permalink: /fr/3-b-3/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-c-1.md b/_indicators/fr/3-c-1.md
deleted file mode 100644
index 50ed04c9632..00000000000
--- a/_indicators/fr/3-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.c.1
-language: fr
-layout: indicator
-permalink: /fr/3-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/3-d-1.md b/_indicators/fr/3-d-1.md
deleted file mode 100644
index b2441d84b1a..00000000000
--- a/_indicators/fr/3-d-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 3.d.1
-language: fr
-layout: indicator
-permalink: /fr/3-d-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-1-1.md b/_indicators/fr/4-1-1.md
deleted file mode 100644
index 306231d6b8e..00000000000
--- a/_indicators/fr/4-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.1.1
-language: fr
-layout: indicator
-permalink: /fr/4-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-2-1.md b/_indicators/fr/4-2-1.md
deleted file mode 100644
index eb19db6916e..00000000000
--- a/_indicators/fr/4-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.2.1
-language: fr
-layout: indicator
-permalink: /fr/4-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-2-2.md b/_indicators/fr/4-2-2.md
deleted file mode 100644
index d9400011615..00000000000
--- a/_indicators/fr/4-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.2.2
-language: fr
-layout: indicator
-permalink: /fr/4-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-3-1.md b/_indicators/fr/4-3-1.md
deleted file mode 100644
index b1f9f90e029..00000000000
--- a/_indicators/fr/4-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.3.1
-language: fr
-layout: indicator
-permalink: /fr/4-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-4-1.md b/_indicators/fr/4-4-1.md
deleted file mode 100644
index 9ff08017325..00000000000
--- a/_indicators/fr/4-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.4.1
-language: fr
-layout: indicator
-permalink: /fr/4-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-5-1.md b/_indicators/fr/4-5-1.md
deleted file mode 100644
index 20e379cf582..00000000000
--- a/_indicators/fr/4-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.5.1
-language: fr
-layout: indicator
-permalink: /fr/4-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-6-1.md b/_indicators/fr/4-6-1.md
deleted file mode 100644
index 1456c18a4b6..00000000000
--- a/_indicators/fr/4-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.6.1
-language: fr
-layout: indicator
-permalink: /fr/4-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-7-1.md b/_indicators/fr/4-7-1.md
deleted file mode 100644
index f00e952cf8e..00000000000
--- a/_indicators/fr/4-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.7.1
-language: fr
-layout: indicator
-permalink: /fr/4-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-a-1.md b/_indicators/fr/4-a-1.md
deleted file mode 100644
index 33a3ccb6e3b..00000000000
--- a/_indicators/fr/4-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.a.1
-language: fr
-layout: indicator
-permalink: /fr/4-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-b-1.md b/_indicators/fr/4-b-1.md
deleted file mode 100644
index 1a3f4604095..00000000000
--- a/_indicators/fr/4-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.b.1
-language: fr
-layout: indicator
-permalink: /fr/4-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/4-c-1.md b/_indicators/fr/4-c-1.md
deleted file mode 100644
index 59a7dec7a6d..00000000000
--- a/_indicators/fr/4-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 4.c.1
-language: fr
-layout: indicator
-permalink: /fr/4-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-1-1.md b/_indicators/fr/5-1-1.md
deleted file mode 100644
index 623068c82f6..00000000000
--- a/_indicators/fr/5-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.1.1
-language: fr
-layout: indicator
-permalink: /fr/5-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-2-1.md b/_indicators/fr/5-2-1.md
deleted file mode 100644
index 7365c7810bd..00000000000
--- a/_indicators/fr/5-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.2.1
-language: fr
-layout: indicator
-permalink: /fr/5-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-2-2.md b/_indicators/fr/5-2-2.md
deleted file mode 100644
index 91326e75d91..00000000000
--- a/_indicators/fr/5-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.2.2
-language: fr
-layout: indicator
-permalink: /fr/5-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-3-1.md b/_indicators/fr/5-3-1.md
deleted file mode 100644
index 60c22c58418..00000000000
--- a/_indicators/fr/5-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.3.1
-language: fr
-layout: indicator
-permalink: /fr/5-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-3-2.md b/_indicators/fr/5-3-2.md
deleted file mode 100644
index bb5a55b0b5d..00000000000
--- a/_indicators/fr/5-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.3.2
-language: fr
-layout: indicator
-permalink: /fr/5-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-4-1.md b/_indicators/fr/5-4-1.md
deleted file mode 100644
index 7f5017fa174..00000000000
--- a/_indicators/fr/5-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.4.1
-language: fr
-layout: indicator
-permalink: /fr/5-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-5-1.md b/_indicators/fr/5-5-1.md
deleted file mode 100644
index 6fd83f9f413..00000000000
--- a/_indicators/fr/5-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.5.1
-language: fr
-layout: indicator
-permalink: /fr/5-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-5-2.md b/_indicators/fr/5-5-2.md
deleted file mode 100644
index b8f0be6691f..00000000000
--- a/_indicators/fr/5-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.5.2
-language: fr
-layout: indicator
-permalink: /fr/5-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-6-1.md b/_indicators/fr/5-6-1.md
deleted file mode 100644
index fbf7f7a0732..00000000000
--- a/_indicators/fr/5-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.6.1
-language: fr
-layout: indicator
-permalink: /fr/5-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-6-2.md b/_indicators/fr/5-6-2.md
deleted file mode 100644
index 5a6818b57bd..00000000000
--- a/_indicators/fr/5-6-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.6.2
-language: fr
-layout: indicator
-permalink: /fr/5-6-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-a-1.md b/_indicators/fr/5-a-1.md
deleted file mode 100644
index 782d39e5eb2..00000000000
--- a/_indicators/fr/5-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.a.1
-language: fr
-layout: indicator
-permalink: /fr/5-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-a-2.md b/_indicators/fr/5-a-2.md
deleted file mode 100644
index d19567028cd..00000000000
--- a/_indicators/fr/5-a-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.a.2
-language: fr
-layout: indicator
-permalink: /fr/5-a-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-b-1.md b/_indicators/fr/5-b-1.md
deleted file mode 100644
index 9afb1005794..00000000000
--- a/_indicators/fr/5-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.b.1
-language: fr
-layout: indicator
-permalink: /fr/5-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/5-c-1.md b/_indicators/fr/5-c-1.md
deleted file mode 100644
index 768f1629823..00000000000
--- a/_indicators/fr/5-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 5.c.1
-language: fr
-layout: indicator
-permalink: /fr/5-c-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-1-1.md b/_indicators/fr/6-1-1.md
deleted file mode 100644
index 84bba84c970..00000000000
--- a/_indicators/fr/6-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.1.1
-language: fr
-layout: indicator
-permalink: /fr/6-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-2-1.md b/_indicators/fr/6-2-1.md
deleted file mode 100644
index f0f084cc7fb..00000000000
--- a/_indicators/fr/6-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.2.1
-language: fr
-layout: indicator
-permalink: /fr/6-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-3-1.md b/_indicators/fr/6-3-1.md
deleted file mode 100644
index ff44a739e90..00000000000
--- a/_indicators/fr/6-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.3.1
-language: fr
-layout: indicator
-permalink: /fr/6-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-3-2.md b/_indicators/fr/6-3-2.md
deleted file mode 100644
index 1402bd89c27..00000000000
--- a/_indicators/fr/6-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.3.2
-language: fr
-layout: indicator
-permalink: /fr/6-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-4-1.md b/_indicators/fr/6-4-1.md
deleted file mode 100644
index f5112490cd0..00000000000
--- a/_indicators/fr/6-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.4.1
-language: fr
-layout: indicator
-permalink: /fr/6-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-4-2.md b/_indicators/fr/6-4-2.md
deleted file mode 100644
index 3e9177562ea..00000000000
--- a/_indicators/fr/6-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.4.2
-language: fr
-layout: indicator
-permalink: /fr/6-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-5-1.md b/_indicators/fr/6-5-1.md
deleted file mode 100644
index 83bf7cd7a0f..00000000000
--- a/_indicators/fr/6-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.5.1
-language: fr
-layout: indicator
-permalink: /fr/6-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-5-2.md b/_indicators/fr/6-5-2.md
deleted file mode 100644
index 30589b74dc5..00000000000
--- a/_indicators/fr/6-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.5.2
-language: fr
-layout: indicator
-permalink: /fr/6-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-6-1.md b/_indicators/fr/6-6-1.md
deleted file mode 100644
index af45026e555..00000000000
--- a/_indicators/fr/6-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.6.1
-language: fr
-layout: indicator
-permalink: /fr/6-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-a-1.md b/_indicators/fr/6-a-1.md
deleted file mode 100644
index 6094251ec5c..00000000000
--- a/_indicators/fr/6-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.a.1
-language: fr
-layout: indicator
-permalink: /fr/6-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/6-b-1.md b/_indicators/fr/6-b-1.md
deleted file mode 100644
index 27770e7132c..00000000000
--- a/_indicators/fr/6-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 6.b.1
-language: fr
-layout: indicator
-permalink: /fr/6-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/7-1-1.md b/_indicators/fr/7-1-1.md
deleted file mode 100644
index 80df841357c..00000000000
--- a/_indicators/fr/7-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.1.1
-language: fr
-layout: indicator
-permalink: /fr/7-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/7-1-2.md b/_indicators/fr/7-1-2.md
deleted file mode 100644
index 7fe6743090f..00000000000
--- a/_indicators/fr/7-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.1.2
-language: fr
-layout: indicator
-permalink: /fr/7-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/7-2-1.md b/_indicators/fr/7-2-1.md
deleted file mode 100644
index c8c938193b8..00000000000
--- a/_indicators/fr/7-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.2.1
-language: fr
-layout: indicator
-permalink: /fr/7-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/7-3-1.md b/_indicators/fr/7-3-1.md
deleted file mode 100644
index cbc2177ebe3..00000000000
--- a/_indicators/fr/7-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.3.1
-language: fr
-layout: indicator
-permalink: /fr/7-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/7-a-1.md b/_indicators/fr/7-a-1.md
deleted file mode 100644
index 455ab9b1a04..00000000000
--- a/_indicators/fr/7-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.a.1
-language: fr
-layout: indicator
-permalink: /fr/7-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/7-b-1.md b/_indicators/fr/7-b-1.md
deleted file mode 100644
index c5bb0965424..00000000000
--- a/_indicators/fr/7-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 7.b.1
-language: fr
-layout: indicator
-permalink: /fr/7-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-1-1.md b/_indicators/fr/8-1-1.md
deleted file mode 100644
index b7099b56aa5..00000000000
--- a/_indicators/fr/8-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.1.1
-language: fr
-layout: indicator
-permalink: /fr/8-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-10-1.md b/_indicators/fr/8-10-1.md
deleted file mode 100644
index bc9f6857d66..00000000000
--- a/_indicators/fr/8-10-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.10.1
-language: fr
-layout: indicator
-permalink: /fr/8-10-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-10-2.md b/_indicators/fr/8-10-2.md
deleted file mode 100644
index b140ee8242b..00000000000
--- a/_indicators/fr/8-10-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.10.2
-language: fr
-layout: indicator
-permalink: /fr/8-10-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-2-1.md b/_indicators/fr/8-2-1.md
deleted file mode 100644
index 2304ccb6f3d..00000000000
--- a/_indicators/fr/8-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.2.1
-language: fr
-layout: indicator
-permalink: /fr/8-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-3-1.md b/_indicators/fr/8-3-1.md
deleted file mode 100644
index 59f144e69bc..00000000000
--- a/_indicators/fr/8-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.3.1
-language: fr
-layout: indicator
-permalink: /fr/8-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-4-1.md b/_indicators/fr/8-4-1.md
deleted file mode 100644
index 0da5a1a1cf7..00000000000
--- a/_indicators/fr/8-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.4.1
-language: fr
-layout: indicator
-permalink: /fr/8-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-4-2.md b/_indicators/fr/8-4-2.md
deleted file mode 100644
index c713594d6a6..00000000000
--- a/_indicators/fr/8-4-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.4.2
-language: fr
-layout: indicator
-permalink: /fr/8-4-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-5-1.md b/_indicators/fr/8-5-1.md
deleted file mode 100644
index 5a2385a91c3..00000000000
--- a/_indicators/fr/8-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.5.1
-language: fr
-layout: indicator
-permalink: /fr/8-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-5-2.md b/_indicators/fr/8-5-2.md
deleted file mode 100644
index fd338760f74..00000000000
--- a/_indicators/fr/8-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.5.2
-language: fr
-layout: indicator
-permalink: /fr/8-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-6-1.md b/_indicators/fr/8-6-1.md
deleted file mode 100644
index 5968aeb2973..00000000000
--- a/_indicators/fr/8-6-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.6.1
-language: fr
-layout: indicator
-permalink: /fr/8-6-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-7-1.md b/_indicators/fr/8-7-1.md
deleted file mode 100644
index 03723f05aa3..00000000000
--- a/_indicators/fr/8-7-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.7.1
-language: fr
-layout: indicator
-permalink: /fr/8-7-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-8-1.md b/_indicators/fr/8-8-1.md
deleted file mode 100644
index f9afa204ca4..00000000000
--- a/_indicators/fr/8-8-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.8.1
-language: fr
-layout: indicator
-permalink: /fr/8-8-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-8-2.md b/_indicators/fr/8-8-2.md
deleted file mode 100644
index 172350b3c3f..00000000000
--- a/_indicators/fr/8-8-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.8.2
-language: fr
-layout: indicator
-permalink: /fr/8-8-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-9-1.md b/_indicators/fr/8-9-1.md
deleted file mode 100644
index 3292206d78e..00000000000
--- a/_indicators/fr/8-9-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.9.1
-language: fr
-layout: indicator
-permalink: /fr/8-9-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-9-2.md b/_indicators/fr/8-9-2.md
deleted file mode 100644
index 40dfd2ab645..00000000000
--- a/_indicators/fr/8-9-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.9.2
-language: fr
-layout: indicator
-permalink: /fr/8-9-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-a-1.md b/_indicators/fr/8-a-1.md
deleted file mode 100644
index f710878122c..00000000000
--- a/_indicators/fr/8-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.a.1
-language: fr
-layout: indicator
-permalink: /fr/8-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/8-b-1.md b/_indicators/fr/8-b-1.md
deleted file mode 100644
index 55da996f56b..00000000000
--- a/_indicators/fr/8-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 8.b.1
-language: fr
-layout: indicator
-permalink: /fr/8-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-1-1.md b/_indicators/fr/9-1-1.md
deleted file mode 100644
index c97875327f4..00000000000
--- a/_indicators/fr/9-1-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.1.1
-language: fr
-layout: indicator
-permalink: /fr/9-1-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-1-2.md b/_indicators/fr/9-1-2.md
deleted file mode 100644
index f24bce1de49..00000000000
--- a/_indicators/fr/9-1-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.1.2
-language: fr
-layout: indicator
-permalink: /fr/9-1-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-2-1.md b/_indicators/fr/9-2-1.md
deleted file mode 100644
index 4c571093723..00000000000
--- a/_indicators/fr/9-2-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.2.1
-language: fr
-layout: indicator
-permalink: /fr/9-2-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-2-2.md b/_indicators/fr/9-2-2.md
deleted file mode 100644
index ecd500a3de9..00000000000
--- a/_indicators/fr/9-2-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.2.2
-language: fr
-layout: indicator
-permalink: /fr/9-2-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-3-1.md b/_indicators/fr/9-3-1.md
deleted file mode 100644
index 5def1e380d9..00000000000
--- a/_indicators/fr/9-3-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.3.1
-language: fr
-layout: indicator
-permalink: /fr/9-3-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-3-2.md b/_indicators/fr/9-3-2.md
deleted file mode 100644
index c47a591ca69..00000000000
--- a/_indicators/fr/9-3-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.3.2
-language: fr
-layout: indicator
-permalink: /fr/9-3-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-4-1.md b/_indicators/fr/9-4-1.md
deleted file mode 100644
index eca75ddb252..00000000000
--- a/_indicators/fr/9-4-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.4.1
-language: fr
-layout: indicator
-permalink: /fr/9-4-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-5-1.md b/_indicators/fr/9-5-1.md
deleted file mode 100644
index 26c40166eed..00000000000
--- a/_indicators/fr/9-5-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.5.1
-language: fr
-layout: indicator
-permalink: /fr/9-5-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-5-2.md b/_indicators/fr/9-5-2.md
deleted file mode 100644
index c3e6278bd1a..00000000000
--- a/_indicators/fr/9-5-2.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.5.2
-language: fr
-layout: indicator
-permalink: /fr/9-5-2/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-a-1.md b/_indicators/fr/9-a-1.md
deleted file mode 100644
index bd6b1c94313..00000000000
--- a/_indicators/fr/9-a-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.a.1
-language: fr
-layout: indicator
-permalink: /fr/9-a-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-b-1.md b/_indicators/fr/9-b-1.md
deleted file mode 100644
index 3a9ebd1fdd6..00000000000
--- a/_indicators/fr/9-b-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.b.1
-language: fr
-layout: indicator
-permalink: /fr/9-b-1/
----
\ No newline at end of file
diff --git a/_indicators/fr/9-c-1.md b/_indicators/fr/9-c-1.md
deleted file mode 100644
index 0015baefa3b..00000000000
--- a/_indicators/fr/9-c-1.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-indicator: 9.c.1
-language: fr
-layout: indicator
-permalink: /fr/9-c-1/
----
\ No newline at end of file
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
index 5a4c64d70e2..eae48715c37 100644
--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -1,26 +1,38 @@
 {% include head.html %}
 {% include header.html %}
-{% include us_heading.html text=t.usa.heading_us %}
+{% include us_heading.html text=page.t.usa.heading_us %}
 <div id="main-content" class="container goal-tiles" role="main">
+
+    {% if site.frontpage_introduction_banner %}
+    <div class="site-intro spacer medium">
+        <h1>{{ site.frontpage_introduction_banner.title | t }}</h1>
+        <div class="description">{{ site.frontpage_introduction_banner.description | t }}</div>
+    </div>
+    {% endif %}
+
     {% assign country_name = site.country.name | t %}
-    <p>{{ t.frontpage.instructions | replace_first: '%before_link', '<span style="display:none" id="jump-to-search"><a href="javascript:void(0)">' | replace_first: '%after_link', '</a></span>' | replace_first: '%name', country_name }}</p>
-    {%- assign goals = site.goals | where: 'language', current_language -%}
-    {% for goal in goals %}
-        {%- assign goal_number = goal.sdg_goal -%}
-        {%- assign default_goal = site.data.translations[default_language].global_goals[goal_number] -%}
-        {%- assign translated_goal = t.global_goals[goal_number] -%}
+    {% assign instructions_default = page.t.frontpage.instructions | replace_first: '%before_link', '<span id="jump-to-search"><a>' | replace_first: '%after_link', '</a></span>' | replace_first: '%name', country_name %}
+    <p class="spacer medium">{{ site.frontpage_instructions | default: instructions_default | t }}</p>
 
+    {% for goal in page.goals %}
         {% cycle 'add row' : '<div class="row no-gutters">', '', '', '', '', '' %}
             <div class="col-xs-4 col-md-2">
-                <a href="./{{ default_goal.short | slugify }}/">
-                  <img src="{{ site.baseurl }}/assets/img/goals/{{ current_language }}/{{ goal_number }}.png" id="goal-{{ goal_number }}" alt="{{ translated_goal.short | escape }} - {{ t.general.goal }} {{ goal_number }}" />
+                <a href="./{{ goal.number }}/">
+                  <img src="{{ goal.icon }}" id="goal-{{ goal.number }}" alt="{{ goal.short | escape }} - {{ page.t.general.goal }} {{ goal.number }}" />
               </a>
             </div>
         {% cycle 'end row' : '', '', '', '', '', '</div>' %}
     {% endfor %}
+    {% comment %}
+        If there were exactly 17 goals, "pad" it with 1 more, to make it come
+        out more symmetrically.
+    {% endcomment %}
+    {% if page.goals.size == 17 %}
         <div class="col-xs-4 col-md-2">
-            <img src="{{ site.baseurl }}/assets/img/goals/{{ current_language }}/18.png" id="goal-18" alt="The Global Goals for Sustainable Development" />
+            <img src="{{ site.goal_image_base }}/{{ page.language }}/18.png" id="goal-18" alt="The Global Goals for Sustainable Development" />
         </div>
+    {% endif %}
     </div>
+    {% include components/download-all-data.html %}
 </div>
 {% include footer.html %}
diff --git a/_layouts/reportingstatus.html b/_layouts/reportingstatus.html
index 570f3715133..f088216c70c 100644
--- a/_layouts/reportingstatus.html
+++ b/_layouts/reportingstatus.html
@@ -1,100 +1,151 @@
 {% include head.html %}
 {% include header.html %}
-{% include us_heading.html text=t.status.reporting_status %}
-<div id="main-content" class="container reportingstatus" data-url="{{ site.baseurl }}/indicators.json">
+{% include us_heading.html text=page.t.status.reporting_status %}
 
-  {% assign goal_indicators = site.data.meta %}
-  {% assign overall_indicator_count = goal_indicators | size %}
-  {% assign exploring_count = goal_indicators | where: 'reporting_status', 'notstarted' | size %}
-  {% assign in_progress_count = goal_indicators | where: 'reporting_status', 'inprogress' | size %}
-  {% assign complete_count = goal_indicators | where: 'reporting_status', 'complete' | size %}
+{%- assign indicator_singular = page.t.general.indicator | downcase -%}
+{%- assign indicators_plural = page.t.general.indicators | downcase -%}
 
-  <div class="goal goal-overall" data-goalid="{{ goal.goal }}">
+<div id="main-content" class="container reportingstatus">
+
+  {%- assign extra_fields = false -%}
+  {%- for extra_field in site.data.reporting.extra_fields -%}
+    {%- assign extra_fields = true -%}
+  {%- endfor -%}
+
+  {%- assign overall = site.data.reporting.overall -%}
+  <div class="goal goal-overall">
       <div class="details">
         <h2 class="status-goal">
-          {{ t.status.overall_reporting_status }} <span class="total"><span>{{ overall_indicator_count }}</span> {{ t.general.indicators | downcase }}</span>
+            {{ page.t.status.overall_reporting_status }} <span class="total"><span>{{ overall.totals.total }}</span> {{ indicators_plural }}</span>
         </h2>
         <div class="summary">
           <div class="statuses">
+            {%- for status in overall.statuses -%}
             <div>
-              <span class="status success">{{ complete_count }}</span><strong>{{ t.status.reported_online }}</strong><span class="value"></span>
-            </div>
-            <div>
-              <span class="status warning">{{ in_progress_count }}</span><strong>{{ t.status.statistics_in_progress }}</strong><span class="value"></span>
-            </div>
-            <div>
-              <span class="status danger">{{ exploring_count }}</span><strong>{{ t.status.exploring_data_sources }}</strong><span class="value"></span>
+              <span class="status {{ status.status | slugify }}">{{ status.count }}</span><strong>{{ status.translation_key | t }}</strong><span class="value">{{ status.percentage | round }}%</span>
             </div>
-            <br style="clear:both;" />
+            {%- endfor -%}
+
+            <br style="clear:both;">
           </div>
         </div>
         <div class="goal-stats">
-          <!-- please keep this 'funky' markup; it has an impact on the display of the bar components -->
-          <span class="success"></span
-          ><span class="warning"></span
-          ><span class="danger"></span>
+            {%- for status in overall.statuses -%}
+            {% assign status_count_precise = status.count | times: 1.0 %}
+            {% assign overall_total_precise = overall.totals.total  | times: 1.0 %}
+            {% assign percentage_precise = status_count_precise | divided_by: overall_total_precise | times: 100 %}
+            <span class="{{ status.status | slugify }}" style="width:{{ percentage_precise }}%" title="{{ status.translation_key | t }}: {{ status.percentage | round }}%"></span>
+            {%- endfor -%}
         </div>
+
       </div>
-    <!--</li>-->
-    <br style="clear:both;" />
+    <br style="clear:both;">
   </div>
 
-  <h2>Status by Goal</h2>
-
-      {%- assign goals = site.goals | where: 'language', current_language -%}
-      {% for goal in goals %}
-        {%- assign goal_number = goal.sdg_goal -%}
-        {%- assign default_goal = site.data.translations[default_language].global_goals[goal_number] -%}
-        {%- assign translated_goal = t.global_goals[goal_number] -%}
-        {% assign goal_indicators = site.data.meta | where: 'sdg_goal', goal_number %}
-        {% assign goal_indicator_count = goal_indicators | size %}
-        {% assign exploring_count = goal_indicators | where: 'reporting_status', 'notstarted' | size %}
-        {% assign in_progress_count = goal_indicators | where: 'reporting_status', 'inprogress' | size %}
-        {% assign complete_count = goal_indicators | where: 'reporting_status', 'complete' | size %}
+  {% if extra_fields %}
+  <ul class="nav nav-tabs reporting-status-view" role="tablist">
+    <li role="presentation" class="nav-item active">
+      <a class="nav-link" data-toggle="tab" href="#goalsview" aria-controls="goals" role="tab" {% include autotrack.html preset="tab_reporting_status_goals" category="Tab change" action="Change reporting status view" label="Change reporting status view to goals" %}>{{ page.t.status.status_by_goal }}</a>
+    </li>
+    {% for extra_field in site.data.reporting.extra_fields %}
+    {% assign extra_field_name = extra_field[0] %}
+    {% assign extra_field_translated = extra_field_name | translate_metadata_field %}
+    {% assign extra_field_autotrack = 'Change reporting status view to ' | append: extra_field_name %}
+    <li role="presentation" class="nav-item">
+      <a class="nav-link" data-toggle="tab" href="#{{ extra_field_name }}view" aria-controls="{{ extra_field_name }}" role="tab" {% include autotrack.html preset="tab_reporting_status_extra_field" category="Tab change" action="Change reporting status view" label=extra_field_autotrack %}>{{ page.t.status.status_by_field | replace: "%field", extra_field_translated }}</a>
+    </li>
+    {% endfor %}
+  </ul>
+  {% else %}
+  <h2>{{ page.t.status.status_by_goal }}</h2>
+  {% endif %}
 
-        <!--<li>-->
-        <div class="goal" data-goalid="{{ goal_number }}">
-          <div class="frame">
-            <a href="{{ site.baseurl }}{{ baseurl_folder }}/{{ default_goal.short | slugify }}/">
-              <img src="{{ site.baseurl }}/assets/img/goals/{{ current_language }}/{{ goal_number }}.png" alt="{{ translated_goal.short | escape }} - {{ t.general.goal }} {{ goal_number }}" width="100" height="100" />
-            </a>
-          </div>
-          <div class="details">
-            <h3 class="status-goal">
-              <a href="{{ site.baseurl }}{{ baseurl_folder }}/{{ default_goal.short | slugify }}/">{{ translated_goal.short }}</a>
-              <span class="total">{{ goal_indicators | size }}<span></span> {{ t.general.indicators | downcase }}</span>
-            </h3>
-            <div class="summary">
-              <div class="statuses">
-                <div>
-                  <span class="status success">{{ complete_count }}</span><strong>{{ t.status.reported_online }}</strong><span class="value"></span>
-                </div>
-                <div>
-                  <span class="status warning">{{ in_progress_count }}</span><strong>{{ t.status.statistics_in_progress }}</strong><span class="value"></span>
-                </div>
-                <div>
-                  <span class="status danger">{{ exploring_count }}</span><strong>{{ t.status.exploring_data_sources }}</strong><span class="value"></span>
-                </div>
-                <br style="clear:both;" />
+  {% if extra_fields %}
+  <div class="tab-content reporting-status-view">
+    <div role="tabpanel" class="tab-pane active" id="goalsview">
+  {% endif %}
+  {%- for goalreport in site.data.reporting.goals -%}
+    {%- assign goal = goalreport.goal | downcase | sdg_lookup -%}
+    <div class="goal">
+        <div class="frame">
+          <a href="{{ goal.url }}">
+            <img src="{{ goal.icon }}" alt="{{ goal.short | escape }} - {{ page.t.general.goal }} {{ goal.number }}" width="100" height="100" />
+          </a>
+        </div>
+        <div class="details">
+          <h3 class="status-goal">
+            <a href="{{ goal.url }}">{{ goal.short }}</a>
+            <span class="total">{{ goalreport.totals.total }} {{ indicators_plural }}</span>
+          </h3>
+          <div class="summary">
+            <div class="statuses">
+              {%- for status in goalreport.statuses -%}
+              <div>
+                <span class="status {{ status.status | slugify }}">{{ status.count }}</span><strong>{{ status.translation_key | t }}</strong><span class="value">{{ status.percentage | round }}%</span>
               </div>
+              {%- endfor -%}
+              <br style="clear:both;">
             </div>
-            <div class="goal-stats">
-              <!-- please keep this 'funky' markup; it has an impact on the display of the bar components -->
-              <span class="success"></span
-              ><span class="warning"></span
-              ><span class="danger"></span>
-            </div>
-            <div class="divider">
+          </div>
+          <div class="goal-stats">
+          {%- for status in goalreport.statuses -%}
+          {% assign status_count_precise = status.count | times: 1.0 %}
+          {% assign goalreport_total_precise = goalreport.totals.total  | times: 1.0 %}
+          {% assign percentage_precise = status_count_precise | divided_by: goalreport_total_precise | times: 100 %}
+            <span class="{{ status.status | slugify }}" style="width:{{ percentage_precise }}%" title="{{ status.translation_key | t }}: {{ status.percentage | round }}%"></span>
+          {%- endfor -%}
+          </div>
+          <div class="divider">
+          </div>
+        </div>
+      <br style="clear:both;">
+    </div>
+  {%- endfor -%}
+  {% if extra_fields %}
+    </div>
+    {%- for extra_field in site.data.reporting.extra_fields -%}
+    {% assign extra_field_name = extra_field[0] %}
+    <div role="tabpanel" class="tab-pane" id="{{ extra_field_name }}view">
+      {%- for fieldreport in extra_field[1] -%}
+      <div class="goal details">
+        <h3 class="status-goal">
+          <span class="status-field">{{ fieldreport[extra_field_name] | t }}</span>
+          <span class="total">{{ fieldreport.totals.total }}
+            {% if fieldreport.totals.total == 1 %}
+              {{ indicator_singular }}
+            {% else %}
+              {{ indicators_plural }}
+            {% endif %}
+          </span>
+        </h3>
+        <div class="summary">
+          <div class="statuses">
+            {%- for status in fieldreport.statuses -%}
+            <div>
+              <span class="status {{ status.status | slugify }}">{{ status.count }}</span><strong>{{ status.translation_key | t }}</strong><span class="value">{{ status.percentage | round }}%</span>
             </div>
+            {%- endfor -%}
+            <br style="clear:both;">
           </div>
-        <!--</li>-->
-        <br style="clear:both;" />
+        </div>
+        <div class="goal-stats">
+        {%- for status in fieldreport.statuses -%}
+        {% assign status_count_precise = status.count | times: 1.0 %}
+        {% assign fieldreport_total_precise = fieldreport.totals.total  | times: 1.0 %}
+        {% assign percentage_precise = status_count_precise | divided_by: fieldreport_total_precise | times: 100 %}
+          <span class="{{ status.status | slugify }}" style="width:{{ percentage_precise }}%" title="{{ status.translation_key | t }}: {{ status.percentage | round }}%"></span>
+        {%- endfor -%}
+        </div>
+        <div class="divider"></div>
+        <br style="clear:both;">
       </div>
-      {% endfor %}
-    <!--</ul>-->
+      {%- endfor -%}
+    </div>
+    {%- endfor -%}
+  </div>
+  {% endif %}
 
   <!--{{ content }}-->
 
-
 </div>
 {% include footer.html %}
diff --git a/_pages/es/index.md b/_pages/es/index.md
deleted file mode 100644
index fda81e93dc1..00000000000
--- a/_pages/es/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Welcome
-permalink: /es/
-layout: frontpage
-language: es
----
-
-Coming Soon.
--------------------
diff --git a/_pages/es/indicators.json b/_pages/es/indicators.json
deleted file mode 100644
index 98f21745380..00000000000
--- a/_pages/es/indicators.json
+++ /dev/null
@@ -1,5 +0,0 @@
----
-layout: indicator-json
-permalink: /es/indicators.json
-language: es
----
diff --git a/_pages/es/reporting-status.md b/_pages/es/reporting-status.md
deleted file mode 100644
index 5601b763637..00000000000
--- a/_pages/es/reporting-status.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: page
-title: Reporting Status
-permalink: /es/reporting-status/
-layout: reportingstatus
-language: es
----
-
-Needs translation.
diff --git a/_pages/es/search.md b/_pages/es/search.md
deleted file mode 100644
index 75ed16dcee4..00000000000
--- a/_pages/es/search.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Search
-permalink: /es/search/
-layout: search
-language: es
----
diff --git a/_pages/fr/index.md b/_pages/fr/index.md
deleted file mode 100644
index fdbf6d1c983..00000000000
--- a/_pages/fr/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Welcome
-permalink: /fr/
-layout: frontpage
-language: fr
----
-
-Coming Soon.
--------------------
diff --git a/_pages/fr/indicators.json b/_pages/fr/indicators.json
deleted file mode 100644
index c06d41f2f1b..00000000000
--- a/_pages/fr/indicators.json
+++ /dev/null
@@ -1,5 +0,0 @@
----
-layout: indicator-json
-permalink: /fr/indicators.json
-language: fr
----
diff --git a/_pages/fr/reporting-status.md b/_pages/fr/reporting-status.md
deleted file mode 100644
index 336c868be7e..00000000000
--- a/_pages/fr/reporting-status.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: page
-title: Reporting Status
-permalink: /fr/reporting-status/
-layout: reportingstatus
-language: fr
----
-
-Needs translation.
diff --git a/_pages/fr/search.md b/_pages/fr/search.md
deleted file mode 100644
index 737755b8094..00000000000
--- a/_pages/fr/search.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Search
-permalink: /fr/search/
-layout: search
-language: fr
----
diff --git a/_pages/index.md b/_pages/index.md
deleted file mode 100755
index c545615801a..00000000000
--- a/_pages/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Welcome
-permalink: /
-layout: frontpage
----
-
-Coming Soon.
--------------------
diff --git a/_pages/indicators.json b/_pages/indicators.json
deleted file mode 100644
index 7eab9b33c3d..00000000000
--- a/_pages/indicators.json
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: indicator-json
-permalink: /indicators.json
----
diff --git a/_pages/reporting-status.md b/_pages/reporting-status.md
deleted file mode 100644
index 8270c877c12..00000000000
--- a/_pages/reporting-status.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: page
-title: Reporting Status
-permalink: /reporting-status/
-layout: reportingstatus
----
-
-Coming in Spring 2017, this page will provide a dashboard summarising the status of data discovery, statistical production, and national reporting of statistics for the Sustainable Development Goals global indicators.
diff --git a/_pages/search.md b/_pages/search.md
deleted file mode 100644
index 9c19f6ef6c5..00000000000
--- a/_pages/search.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Search
-permalink: /search/
-layout: search
----
diff --git a/assets/css/custom.scss b/_sass/custom.scss
similarity index 79%
rename from assets/css/custom.scss
rename to _sass/custom.scss
index e7f1877571a..dadc7f73c83 100644
--- a/assets/css/custom.scss
+++ b/_sass/custom.scss
@@ -1,6 +1,7 @@
----
-# custom styles
----
+body {
+  background: none;
+  padding-top: 0;
+}
 #main-content {
   #map, #infoPanel {
     width: 710px;
@@ -13,13 +14,15 @@
 
 header {
   background: #fff;
-  border-bottom: solid 2px #CCC;
 }
 
 .us-heading {
   background-color: #205493;
   padding-top: 20px;
   padding-bottom: 20px;
+  h1 {
+    color: white;
+  }
 }
 
 body.contrast-high {
@@ -46,6 +49,13 @@ body.contrast-high {
 
 #disclaimer {
   background: #eaeaea;
+  font-size: 14px;
+
+  .alert {
+    margin-bottom: 0;
+    padding: 10px 0;
+  }
+
   @media only screen and (max-width: 680px) {
     font-size: 0.75em;
   }