diff --git a/tools/setup/lang.json b/tools/setup/lang.json
index 7fbe8a80e7..c60d3fadd7 100644
--- a/tools/setup/lang.json
+++ b/tools/setup/lang.json
@@ -31,7 +31,6 @@
     "matlab": 33,
     "mql": 9,
     "mql4": 9,
-    "none": 1,
     "objective-c": 35,
     "objectivec": 35,
     "objectpascal": 42,
@@ -39,7 +38,6 @@
     "perl": 40,
     "php": 44,
     "pl": 40,
-    "plain": 1,
     "prolog": 16,
     "python": 46,
     "quote": 50,
@@ -47,13 +45,13 @@
     "rb": 39,
     "ruby": 39,
     "rust": 8,
-    "text": 1,
     "sas": 30,
     "scala": 21,
     "scheme": 14,
     "sql": 32,
     "swift": 41,
     "tex": 40,
+    "text": 1,
     "vb.net": 45,
     "vbnet": 45,
     "xml": 1
diff --git a/zerver/lib/bugdown/fenced_code.py b/zerver/lib/bugdown/fenced_code.py
index f9fcea18d4..867145a231 100644
--- a/zerver/lib/bugdown/fenced_code.py
+++ b/zerver/lib/bugdown/fenced_code.py
@@ -166,11 +166,6 @@ def generic_handler(processor: Any, output: MutableSequence[str],
     else:
         return CodeHandler(processor, output, fence, lang, run_content_validators)
 
-def remap_language(lang: str) -> str:
-    if lang in ['none', 'noop', 'text', 'plain']:
-        return ''
-    return lang
-
 def check_for_new_fence(processor: Any, output: MutableSequence[str], line: str,
                         run_content_validators: Optional[bool]=False,
                         default_language: Optional[str]=None) -> None:
@@ -180,7 +175,6 @@ def check_for_new_fence(processor: Any, output: MutableSequence[str], line: str,
         lang = m.group('lang')
         if not lang and default_language:
             lang = default_language
-        lang = remap_language(lang)
         handler = generic_handler(processor, output, fence, lang, run_content_validators, default_language)
         processor.push(handler)
     else: