diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index d3e70ac7..82e495dd 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -40,7 +40,6 @@ ASP:
   - .ascx
   - .ashx
   - .asmx
-  - .asp
   - .aspx
   - .axd
 
@@ -52,15 +51,12 @@ ActionScript:
   aliases:
   - as3
   primary_extension: .as
-  extensions:
-  - .as
 
 Ada:
   type: programming
   color: "#02f88c"
   primary_extension: .adb
   extensions:
-  - .adb
   - .ads
 
 ApacheConf:
@@ -85,8 +81,6 @@ Arc:
   color: "#ca2afe"
   lexer: Text only
   primary_extension: .arc
-  extensions:
-  - .arc
 
 Arduino:
   type: programming
@@ -102,14 +96,10 @@ Assembly:
   aliases:
   - nasm
   primary_extension: .asm
-  extensions:
-  - .asm
 
 Augeas:
   type: programming
   primary_extension: .aug
-  extensions:
-  - .aug
 
 AutoHotkey:
   type: programming
@@ -127,37 +117,27 @@ Batchfile:
   - bat
   primary_extension: .bat
   extensions:
-  - .bat
   - .cmd
 
 Befunge:
   primary_extension: .befunge
-  extensions:
-  - .befunge
 
 BlitzMax:
   primary_extension: .bmx
-  extensions:
-  - .bmx
 
 Boo:
   type: programming
   color: "#d4bec1"
   primary_extension: .boo
-  extensions:
-  - .boo
 
 Brainfuck:
   primary_extension: .b
   extensions:
-  - .b
   - .bf
 
 Bro:
   type: programming
   primary_extension: .bro
-  extensions:
-  - .bro
 
 C:
   type: programming
@@ -174,8 +154,6 @@ C#:
   aliases:
   - csharp
   primary_extension: .cs
-  extensions:
-  - .cs
 
 C++:
   type: programming
@@ -199,8 +177,6 @@ C-ObjDump:
   type: data
   lexer: c-objdump
   primary_extension: .c-objdump
-  extensions:
-  - .c-objdump
 
 C2hs Haskell:
   type: programming
@@ -209,13 +185,10 @@ C2hs Haskell:
   aliases:
   - c2hs
   primary_extension: .chs
-  extensions:
-  - .chs
 
 CMake:
   primary_extension: .cmake
   extensions:
-  - .cmake
   - .cmake.in
   filenames:
   - CMakeLists.txt
@@ -223,8 +196,6 @@ CMake:
 CSS:
   ace_mode: css
   primary_extension: .css
-  extensions:
-  - .css
 
 Ceylon:
   type: programming
@@ -234,8 +205,6 @@ Ceylon:
 ChucK:
   lexer: Java
   primary_extension: .ck
-  extensions:
-  - .ck
 
 Clojure:
   type: programming
@@ -243,7 +212,6 @@ Clojure:
   color: "#db5855"
   primary_extension: .clj
   extensions:
-  - .clj
   - .cljs
 
 CoffeeScript:
@@ -270,7 +238,6 @@ ColdFusion:
   primary_extension: .cfm
   extensions:
   - .cfc
-  - .cfm
 
 Common Lisp:
   type: programming
@@ -279,7 +246,6 @@ Common Lisp:
   - lisp
   primary_extension: .lisp
   extensions:
-  - .lisp
   - .lsp
   - .ny
 
@@ -292,15 +258,12 @@ Cpp-ObjDump:
   lexer: cpp-objdump
   primary_extension: .cppobjdump
   extensions:
-  - .cppobjdump
   - .c++objdump
   - .cxx-objdump
 
 Cucumber:
   lexer: Gherkin
   primary_extension: .feature
-  extensions:
-  - .feature
 
 Cython:
   type: programming
@@ -309,22 +272,18 @@ Cython:
   extensions:
   - .pxd
   - .pxi
-  - .pyx
 
 D:
   type: programming
   color: "#fcd46d"
   primary_extension: .d
   extensions:
-  - .d
   - .di
 
 D-ObjDump:
   type: data
   lexer: d-objdump
   primary_extension: .d-objdump
-  extensions:
-  - .d-objdump
 
 Darcs Patch:
   search_term: dpatch
@@ -332,7 +291,6 @@ Darcs Patch:
   - dpatch
   primary_extension: .darcspatch
   extensions:
-  - .darcspatch
   - .dpatch
 
 Dart:
@@ -345,7 +303,6 @@ Delphi:
   primary_extension: .pas
   extensions:
   - .lpr
-  - .pas
 
 DCPU-16 ASM:
   type: programming
@@ -353,29 +310,22 @@ DCPU-16 ASM:
   primary_extension: .dasm16
   extensions:
   - .dasm
-  - .dasm16
   aliases:
   - dasm16
 
 Diff:
   primary_extension: .diff
-  extensions:
-  - .diff
 
 Dylan:
   type: programming
   color: "#3ebc27"
   primary_extension: .dylan
-  extensions:
-  - .dylan
 
 Ecere Projects:
   type: data
   group: JavaScript
   lexer: JSON
   primary_extension: .epj
-  extensions:
-  - .epj
 
 Ecl:
   type: programming
@@ -390,15 +340,12 @@ Eiffel:
   lexer: Text only
   color: "#946d57"
   primary_extension: .e
-  extensions:
-  - .e
 
 Elixir:
   type: programming
   color: "#6e4a7e"
   primary_extension: .ex
   extensions:
-  - .ex
   - .exs
 
 Elm:
@@ -423,7 +370,6 @@ Erlang:
   color: "#949e0e"
   primary_extension: .erl
   extensions:
-  - .erl
   - .hrl
 
 F#:
@@ -433,7 +379,6 @@ F#:
   search_term: ocaml
   primary_extension: .fs
   extensions:
-  - .fs
   - .fsi
   - .fsx
 
@@ -455,7 +400,6 @@ FORTRAN:
   - .f03
   - .f08
   - .f77
-  - .f90
   - .f95
   - .for
   - .fpp
@@ -464,8 +408,6 @@ Factor:
   type: programming
   color: "#636746"
   primary_extension: .factor
-  extensions:
-  - .factor
 
 Fancy:
   type: programming
@@ -473,7 +415,6 @@ Fancy:
   primary_extension: .fy
   extensions:
   - .fancypack
-  - .fy
   filenames:
   - Fakefile
 
@@ -481,8 +422,6 @@ Fantom:
   type: programming
   color: "#dbded5"
   primary_extension: .fan
-  extensions:
-  - .fan
 
 Forth:
   type: programming
@@ -502,22 +441,16 @@ GAS:
 
 Genshi:
   primary_extension: .kid
-  extensions:
-  - .kid
 
 Gentoo Ebuild:
   group: Shell
   lexer: Bash
   primary_extension: .ebuild
-  extensions:
-  - .ebuild
 
 Gentoo Eclass:
   group: Shell
   lexer: Bash
   primary_extension: .eclass
-  extensions:
-  - .eclass
 
 Gettext Catalog:
   search_term: pot
@@ -526,15 +459,12 @@ Gettext Catalog:
   - pot
   primary_extension: .po
   extensions:
-  - .po
   - .pot
 
 Go:
   type: programming
   color: "#8d04eb"
   primary_extension: .go
-  extensions:
-  - .go
 
 Gosu:
   type: programming
@@ -551,7 +481,6 @@ Groff:
   - '.5'
   - '.6'
   - '.7'
-  - .man
 
 Groovy:
   type: programming
@@ -574,7 +503,6 @@ HTML:
   primary_extension: .html
   extensions:
   - .htm
-  - .html
   - .xhtml
 
 HTML+Django:
@@ -593,15 +521,12 @@ HTML+ERB:
   - erb
   primary_extension: .erb
   extensions:
-  - .erb
   - .html.erb
 
 HTML+PHP:
   type: markup
   group: HTML
   primary_extension: .phtml
-  extensions:
-  - .phtml
 
 HTTP:
   type: data
@@ -622,7 +547,6 @@ Haskell:
   color: "#29b544"
   primary_extension: .hs
   extensions:
-  - .hs
   - .hsc
 
 Haxe:
@@ -656,8 +580,6 @@ Io:
   type: programming
   color: "#a9188d"
   primary_extension: .io
-  extensions:
-  - .io
 
 Ioke:
   type: programming
@@ -686,8 +608,6 @@ Java Server Pages:
   aliases:
   - jsp
   primary_extension: .jsp
-  extensions:
-  - .jsp
 
 JavaScript:
   type: programming
@@ -724,8 +644,6 @@ Kotlin:
 
 LLVM:
   primary_extension: .ll
-  extensions:
-  - .ll
 
 Lasso:
   type: programming
@@ -736,7 +654,6 @@ Lasso:
   extensions:
   - .inc
   - .las
-  - .lasso
   - .lasso9
   - .ldml
 
@@ -752,7 +669,6 @@ LilyPond:
   primary_extension: .ly
   extensions:
   - .ily
-  - .ly
 
 Literate Haskell:
   type: programming
@@ -761,8 +677,6 @@ Literate Haskell:
   aliases:
   - lhs
   primary_extension: .lhs
-  extensions:
-  - .lhs
 
 LiveScript:
   type: programming
@@ -786,7 +700,6 @@ Lua:
   color: "#fa1fa1"
   primary_extension: .lua
   extensions:
-  - .lua
   - .nse
 
 Makefile:
@@ -804,7 +717,6 @@ Makefile:
 Mako:
   primary_extension: .mako
   extensions:
-  - .mako
   - .mao
 
 Markdown:
@@ -823,8 +735,6 @@ Matlab:
   type: programming
   color: "#bb92ac"
   primary_extension: .matlab
-  extensions:
-  - .matlab
 
 Max:
   type: programming
@@ -854,8 +764,6 @@ Mirah:
 Moocode:
   lexer: MOOCode
   primary_extension: .moo
-  extensions:
-  - .moo
 
 MoonScript:
   type: programming
@@ -863,8 +771,6 @@ MoonScript:
 
 Myghty:
   primary_extension: .myt
-  extensions:
-  - .myt
 
 Nemerle:
   type: programming
@@ -897,7 +803,6 @@ NumPy:
   group: Python
   primary_extension: .numpy
   extensions:
-  - .numpy
   - .numpyw
   - .numsc
 
@@ -915,8 +820,6 @@ ObjDump:
   type: data
   lexer: objdump
   primary_extension: .objdump
-  extensions:
-  - .objdump
 
 Objective-C:
   type: programming
@@ -935,7 +838,6 @@ Objective-J:
   - obj-j
   primary_extension: .j
   extensions:
-  - .j
   - .sj
 
 Omgrofl:
@@ -1028,7 +930,6 @@ Prolog:
   primary_extension: .prolog
   extensions:
   - .pro
-  - .prolog
 
 Puppet:
   type: programming
@@ -1044,8 +945,6 @@ Pure Data:
   color: "#91de79"
   lexer: Text only
   primary_extension: .pd
-  extensions:
-  - .pd
 
 Python:
   type: programming
@@ -1065,23 +964,17 @@ Python traceback:
   lexer: Python Traceback
   searchable: false
   primary_extension: .pytb
-  extensions:
-  - .pytb
 
 R:
   type: programming
   color: "#198ce7"
   lexer: S
   primary_extension: .r
-  extensions:
-  - .r
 
 RHTML:
   type: markup
   group: HTML
   primary_extension: .rhtml
-  extensions:
-  - .rhtml
 
 Racket:
   type: programming
@@ -1089,7 +982,6 @@ Racket:
   color: "#ae17ff"
   primary_extension: .rkt
   extensions:
-  - .rkt
   - .rktd
   - .rktl
 
@@ -1098,8 +990,6 @@ Raw token data:
   aliases:
   - raw
   primary_extension: .raw
-  extensions:
-  - .raw
 
 Rebol:
   type: programming
@@ -1109,12 +999,9 @@ Rebol:
   extensions:
   - .r2
   - .r3
-  - .rebol
 
 Redcode:
   primary_extension: .cw
-  extensions:
-  - .cw
 
 Ruby:
   type: programming
@@ -1163,16 +1050,12 @@ SQL:
   ace_mode: sql
   searchable: false
   primary_extension: .sql
-  extensions:
-  - .sql
 
 Sage:
   type: programming
   lexer: Python
   group: Python
   primary_extension: .sage
-  extensions:
-  - .sage
 
 Sass:
   type: markup
@@ -1190,7 +1073,6 @@ Scheme:
   color: "#1e4aec"
   primary_extension: .scm
   extensions:
-  - .scm
   - .sls
   - .ss
 
@@ -1203,8 +1085,6 @@ Self:
   color: "#0579aa"
   lexer: Text only
   primary_extension: .self
-  extensions:
-  - .self
 
 Shell:
   type: programming
@@ -1221,13 +1101,9 @@ Smalltalk:
   type: programming
   color: "#596706"
   primary_extension: .st
-  extensions:
-  - .st
 
 Smarty:
   primary_extension: .tpl
-  extensions:
-  - .tpl
 
 Standard ML:
   type: programming
@@ -1246,8 +1122,6 @@ Tcl:
   type: programming
   color: "#e4cc98"
   primary_extension: .tcl
-  extensions:
-  - .tcl
 
 Tcsh:
   type: programming
@@ -1255,7 +1129,6 @@ Tcsh:
   primary_extension: .tcsh
   extensions:
   - .csh
-  - .tcsh
 
 TeX:
   type: markup
@@ -1269,7 +1142,6 @@ TeX:
   - .ins
   - .ltx
   - .sty
-  - .tex
   - .toc
 
 Tea:
@@ -1282,8 +1154,6 @@ Textile:
   ace_mode: textile
   wrap: true
   primary_extension: .textile
-  extensions:
-  - .textile
 
 Turing:
   type: programming
@@ -1298,23 +1168,18 @@ Twig:
   group: PHP
   lexer: HTML+Django/Jinja
   primary_extension: .twig
-  extensions:
-  - .twig
 
 VHDL:
   type: programming
   lexer: vhdl
   color: "#543978"
   primary_extension: .vhdl
-  extensions:
-  - .vhdl
 
 Vala:
   type: programming
   color: "#ee7d06"
   primary_extension: .vala
   extensions:
-  - .vala
   - .vapi
 
 Verilog:
@@ -1330,8 +1195,6 @@ VimL:
   aliases:
   - vim
   primary_extension: .vim
-  extensions:
-  - .vim
   filenames:
   - vimrc
   - gvimrc
@@ -1344,7 +1207,6 @@ Visual Basic:
   extensions:
   - .bas
   - .frx
-  - .vb
   - .vba
   - .vbs
 
@@ -1389,14 +1251,11 @@ XQuery:
   primary_extension: .xquery
   extensions:
   - .xq
-  - .xquery
   - .xqy
 
 XS:
   lexer: C
   primary_extension: .xs
-  extensions:
-  - .xs
 
 XSLT:
   type: markup
@@ -1410,29 +1269,23 @@ YAML:
   primary_extension: .yml
   extensions:
   - .yaml
-  - .yml
 
 eC:
   type: programming
   search_term: ec
   primary_extension: .ec
   extensions:
-  - .ec
   - .eh
 
 mupad:
   lexer: MuPAD
   primary_extension: .mu
-  extensions:
-  - .mu
 
 ooc:
   type: programming
   lexer: Ooc
   color: "#b0b77e"
   primary_extension: .ooc
-  extensions:
-  - .ooc
 
 reStructuredText:
   type: markup
@@ -1442,5 +1295,4 @@ reStructuredText:
   - rst
   primary_extension: .rst
   extensions:
-  - .rst
   - .rest