diff --git a/src/supported-locales.js b/src/supported-locales.js
index 6c948e15..3e834f4a 100644
--- a/src/supported-locales.js
+++ b/src/supported-locales.js
@@ -30,7 +30,7 @@ const locales = {
     'zu': {name: 'isiZulu'},
     'is': {name: 'Íslenska'},
     'it': {name: 'Italiano'},
-    // 'lv': {name: 'Latviešu'},
+    // 'lv': {name: 'Latviešu'}, // restore when reviewed
     'lt': {name: 'Lietuvių'},
     'hu': {name: 'Magyar'},
     'mi': {name: 'Māori'},
@@ -38,7 +38,7 @@ const locales = {
     'ja': {name: '日本語'},
     'ja-Hira': {name: 'にほんご'},
     'nb': {name: 'Norsk Bokmål'},
-    // 'nn': {name: 'Norsk Nynorsk'},
+    // 'nn': {name: 'Norsk Nynorsk'}, // restore when reviewed
     'th': {name: 'ไทย'},
     'pl': {name: 'Polski'},
     'pt': {name: 'Português'},
@@ -46,7 +46,7 @@ const locales = {
     'ro': {name: 'Română'},
     'ru': {name: 'Русский'},
     'sr': {name: 'Српски'},
-    // 'sk': {name: 'Slovenčina'},
+    // 'sk': {name: 'Slovenčina'}, // restore when reviewed
     'sl': {name: 'Slovenščina'},
     'fi': {name: 'Suomi'},
     'sv': {name: 'Svenska'},
@@ -99,75 +99,56 @@ const isRtl = locale => {
     return rtlLocales.indexOf(locale) !== -1;
 };
 
+
+// wwwLocales is deprecated. Remove it once we know it's no longer used.
+// For now it's just identical.
 const wwwLocales = {
     'ab': {name: 'Аҧсшәа'},
     'ar': {name: 'العربية'},
-    'an': {name: 'Aragonés'},
-    'ast': {name: 'Asturianu'},
+    'am': {name: 'አማርኛ'},
+    'az': {name: 'Azeri'},
     'id': {name: 'Bahasa Indonesia'},
-    'ms': {name: 'Bahasa Melayu'},
-    'be': {name: 'Беларуская'},
-    'bg': {name: 'Български'},
     'ca': {name: 'Català'},
     'cs': {name: 'Česky'},
     'cy': {name: 'Cymraeg'},
     'da': {name: 'Dansk'},
     'de': {name: 'Deutsch'},
-    'yum': {name: 'Edible Scratch'},
     'et': {name: 'Eesti'},
     'el': {name: 'Ελληνικά'},
     'en': {name: 'English'},
-    'eo': {name: 'Esperanto'},
     'es': {name: 'Español'},
+    'es-419': {name: 'Español Latinoamericano'},
     'eu': {name: 'Euskara'},
-    'fa': {name: 'فارسی'},
     'fr': {name: 'Français'},
-    'fur': {name: 'Furlan'},
     'ga': {name: 'Gaeilge'},
     'gd': {name: 'Gàidhlig'},
     'gl': {name: 'Galego'},
     'ko': {name: '한국어'},
-    'hy': {name: 'Հայերեն'},
     'he': {name: 'עִבְרִית'},
-    'hi': {name: 'हिन्दी'},
     'hr': {name: 'Hrvatski'},
     'zu': {name: 'isiZulu'},
     'is': {name: 'Íslenska'},
     'it': {name: 'Italiano'},
-    'kn': {name: 'ಭಾಷೆ-ಹೆಸರು'},
-    'rw': {name: 'Kinyarwanda'},
-    'ht': {name: 'Kreyòl'},
-    'ku': {name: 'Kurdî'},
-    'la': {name: 'Latina'},
-    'lv': {name: 'Latviešu'},
+    // 'lv': {name: 'Latviešu'}, // uncomment when reviewed
     'lt': {name: 'Lietuvių'},
-    'mk': {name: 'Македонски'},
     'hu': {name: 'Magyar'},
-    'ml': {name: 'മലയാളം'},
-    'mt': {name: 'Malti'},
-    'cat': {name: 'Meow'},
-    'mr': {name: 'मराठी'},
-    'mn': {name: 'Монгол хэл'},
-    'my': {name: 'မြန်မာဘာသာ'},
+    'mi': {name: 'Māori'},
     'nl': {name: 'Nederlands'},
     'ja': {name: '日本語'},
+    'ja-Hira': {name: 'にほんご'},
     'nb': {name: 'Norsk Bokmål'},
-    'nn': {name: 'Norsk Nynorsk'},
-    'uz': {name: 'Oʻzbekcha'},
+    // 'nn': {name: 'Norsk Nynorsk'}, // uncomment when reviewed
     'th': {name: 'ไทย'},
     'pl': {name: 'Polski'},
     'pt': {name: 'Português'},
     'pt-br': {name: 'Português Brasileiro'},
     'ro': {name: 'Română'},
     'ru': {name: 'Русский'},
-    'sc': {name: 'Sardu'},
-    'sq': {name: 'Shqip'},
-    'sk': {name: 'Slovenčina'},
-    'sl': {name: 'Slovenščina'},
     'sr': {name: 'Српски'},
+    // 'sk': {name: 'Slovenčina'}, // uncomment when reviewed
+    'sl': {name: 'Slovenščina'},
     'fi': {name: 'Suomi'},
     'sv': {name: 'Svenska'},
-    'te': {name: 'తెలుగు'},
     'vi': {name: 'Tiếng Việt'},
     'tr': {name: 'Türkçe'},
     'uk': {name: 'Українська'},