diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 461535fe..ece0347f 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1071,10 +1071,6 @@ Liquid:
   type: markup
   lexer: Text only
   primary_extension: .liquid
-  extensions:
-  - .html
-  - .json
-  - .xml
 
 Literate Agda:
   type: programming
diff --git a/lib/linguist/samples.json b/lib/linguist/samples.json
index 676c2585..f174c9ab 100644
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
@@ -267,10 +267,7 @@
       ".lfe"
     ],
     "Liquid": [
-      ".html",
-      ".json",
-      ".liquid",
-      ".xml"
+      ".liquid"
     ],
     "Literate Agda": [
       ".lagda"
@@ -684,8 +681,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 590357,
-  "languages_total": 716,
+  "tokens_total": 589756,
+  "languages_total": 713,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -34159,220 +34156,6 @@
       "reproduce": 1
     },
     "Liquid": {
-      "<?xml>": 1,
-      "version=": 2,
-      "encoding=": 1,
-      "<rss>": 1,
-      "xmlns": 6,
-      "content=": 2,
-      "wfw=": 1,
-      "dc=": 1,
-      "atom=": 1,
-      "sy=": 1,
-      "slash=": 1,
-      "<channel>": 1,
-      "<title>": 4,
-      "xml": 2,
-      "lang=": 3,
-      "Jekyll": 6,
-      "Simple": 3,
-      "blog": 3,
-      "-": 17,
-      "aware": 3,
-      "static": 5,
-      "sites": 3,
-      "</title>": 4,
-      "<atom:link>": 1,
-      "type=": 3,
-      "href=": 19,
-      "rel=": 3,
-      "<link>": 3,
-      "http": 8,
-      "//jekyllrb.com/": 2,
-      "</link>": 3,
-      "<pubDate>": 2,
-      "{": 119,
-      "site.time": 2,
-      "|": 39,
-      "date_to_rfc822": 3,
-      "}": 119,
-      "</pubDate>": 2,
-      "<lastBuildDate>": 1,
-      "</lastBuildDate>": 1,
-      "<language>": 1,
-      "en": 1,
-      "US": 1,
-      "</language>": 1,
-      "<generator>": 1,
-      "v": 1,
-      "jekyll.version": 1,
-      "</generator>": 1,
-      "<description>": 3,
-      "Transform": 3,
-      "your": 7,
-      "plain": 3,
-      "text": 3,
-      "into": 3,
-      "websites": 3,
-      "and": 6,
-      "blogs.": 3,
-      "</description>": 3,
-      "<image>": 1,
-      "<url>": 1,
-      "//jekyllrb.com/img/logo": 1,
-      "rss.png": 1,
-      "</url>": 1,
-      "<width>": 1,
-      "</width>": 1,
-      "<height>": 1,
-      "</height>": 1,
-      "</image>": 1,
-      "%": 58,
-      "for": 11,
-      "post": 1,
-      "in": 12,
-      "site.posts": 2,
-      "<item>": 1,
-      "post.title": 1,
-      "xml_escape": 4,
-      "//jekyllrb.com": 2,
-      "post.url": 2,
-      "post.date": 1,
-      "<dc:creator>": 1,
-      "post.author": 1,
-      "</dc:creator>": 1,
-      "tag": 6,
-      "post.tags": 1,
-      "<category>": 2,
-      "</category>": 2,
-      "endfor": 9,
-      "cat": 2,
-      "post.categories": 1,
-      "<guid>": 1,
-      "isPermaLink=": 1,
-      "</guid>": 1,
-      "post.content": 1,
-      "</item>": 1,
-      "</channel>": 1,
-      "</rss>": 1,
-      "<section>": 4,
-      "class=": 58,
-      "<div>": 41,
-      "<p>": 12,
-      "&": 10,
-      "nbsp": 4,
-      ";": 10,
-      "</p>": 12,
-      "</div>": 41,
-      "</section>": 4,
-      "<h2>": 7,
-      "</h2>": 7,
-      "No": 1,
-      "more": 2,
-      "databases": 1,
-      "comment": 1,
-      "moderation": 1,
-      "or": 2,
-      "pesky": 1,
-      "updates": 1,
-      "to": 3,
-      "install": 2,
-      "just": 1,
-      "<em>": 3,
-      "content": 1,
-      "</em>": 3,
-      ".": 5,
-      "<a>": 18,
-      "How": 1,
-      "works": 1,
-      "rarr": 4,
-      "</a>": 18,
-      "Static": 2,
-      "Markdown": 1,
-      "(": 2,
-      "Textile": 1,
-      ")": 2,
-      "Liquid": 1,
-      "HTML": 1,
-      "<span>": 15,
-      "amp": 1,
-      "</span>": 15,
-      "CSS": 1,
-      "go": 1,
-      "in.": 1,
-      "come": 1,
-      "out": 1,
-      "ready": 1,
-      "deployment.": 1,
-      "template": 1,
-      "guide": 1,
-      "Blog": 1,
-      "Permalinks": 1,
-      "categories": 1,
-      "pages": 1,
-      "posts": 1,
-      "custom": 2,
-      "layouts": 1,
-      "are": 3,
-      "all": 1,
-      "first": 1,
-      "class": 1,
-      "citizens": 1,
-      "here.": 1,
-      "Migrate": 1,
-      "<h4>": 2,
-      "Get": 1,
-      "up": 1,
-      "running": 1,
-      "seconds": 1,
-      "</h4>": 2,
-      "Quick": 1,
-      "start": 1,
-      "Instructions": 1,
-      "gem": 1,
-      "jekyll": 3,
-      "new": 1,
-      "my": 2,
-      "awesome": 3,
-      "site": 4,
-      "cd": 1,
-      "/my": 1,
-      "serve": 1,
-      "#": 1,
-      "Now": 1,
-      "browse": 1,
-      "//localhost": 1,
-      "<img>": 5,
-      "src=": 6,
-      "width=": 1,
-      "height=": 1,
-      "alt=": 3,
-      "<strong>": 1,
-      "Free": 1,
-      "hosting": 2,
-      "</strong>": 1,
-      "with": 2,
-      "GitHub": 4,
-      "Pages": 3,
-      "Sick": 1,
-      "of": 1,
-      "dealing": 1,
-      "companies": 1,
-      "powered": 1,
-      "by": 2,
-      "so": 1,
-      "you": 1,
-      "can": 1,
-      "easily": 1,
-      "deploy": 1,
-      "using": 1,
-      "free": 1,
-      "mdash": 1,
-      "domain": 1,
-      "name": 1,
-      "all.": 1,
-      "Learn": 1,
-      "about": 1,
       "<!DOCTYPE>": 1,
       "html": 1,
       "PUBLIC": 1,
@@ -34383,6 +34166,7 @@
       "0": 1,
       "Transitional": 1,
       "EN": 1,
+      "http": 2,
       "www": 1,
       "w3": 1,
       "org": 1,
@@ -34392,11 +34176,20 @@
       "dtd": 1,
       "<html>": 1,
       "xmlns=": 1,
+      "xml": 1,
+      "lang=": 2,
       "<head>": 1,
       "<meta>": 1,
       "equiv=": 1,
+      "content=": 1,
+      "<title>": 1,
+      "{": 89,
       "shop.name": 2,
+      "}": 89,
+      "-": 4,
       "page_title": 1,
+      "</title>": 1,
+      "|": 31,
       "global_asset_url": 5,
       "stylesheet_tag": 3,
       "script_tag": 5,
@@ -34406,24 +34199,45 @@
       "</head>": 1,
       "<body>": 1,
       "id=": 28,
+      "<p>": 1,
+      "class=": 14,
+      "<a>": 9,
+      "href=": 9,
       "Skip": 1,
+      "to": 1,
       "navigation.": 1,
+      "</a>": 9,
+      "</p>": 1,
+      "%": 46,
       "if": 5,
       "cart.item_count": 7,
+      "<div>": 23,
       "style=": 5,
+      "<h2>": 3,
       "There": 1,
       "pluralize": 3,
+      "in": 8,
       "title=": 3,
+      "your": 1,
       "cart": 1,
+      "</h2>": 3,
+      "<h4>": 1,
       "Your": 1,
       "subtotal": 1,
       "is": 1,
       "cart.total_price": 2,
       "money": 5,
+      ".": 3,
+      "</h4>": 1,
+      "for": 6,
       "item": 1,
       "cart.items": 1,
       "onMouseover=": 2,
       "onMouseout=": 2,
+      "<img>": 4,
+      "src=": 5,
+      "</div>": 23,
+      "endfor": 6,
       "<br>": 2,
       "endif": 5,
       "<h1>": 1,
@@ -34432,6 +34246,8 @@
       "View": 1,
       "Mini": 1,
       "Cart": 1,
+      "(": 1,
+      ")": 1,
       "<hr>": 3,
       "content_for_layout": 1,
       "<ul>": 5,
@@ -34445,19 +34261,23 @@
       "</li>": 5,
       "</ul>": 5,
       "tags": 1,
+      "tag": 4,
       "collection.tags": 1,
+      "<span>": 1,
       "link_to_add_tag": 1,
+      "</span>": 1,
       "highlight_active_tag": 1,
       "link_to_tag": 1,
       "linklists.footer.links": 1,
       "All": 1,
       "prices": 1,
+      "are": 1,
       "shop.currency": 1,
       "Powered": 1,
+      "by": 1,
       "Shopify": 1,
       "</body>": 1,
       "</html>": 1,
-      "jsonify": 1,
       "<h3>": 1,
       "We": 1,
       "have": 1,
@@ -34467,6 +34287,8 @@
       "image": 1,
       "product.images": 1,
       "forloop.first": 1,
+      "rel=": 2,
+      "alt=": 2,
       "else": 1,
       "product.title": 1,
       "Vendor": 1,
@@ -34494,6 +34316,7 @@
       "</option>": 1,
       "</select>": 1,
       "<input>": 1,
+      "type=": 2,
       "</form>": 1,
       "product.description": 1,
       "<script>": 1,
@@ -62640,7 +62463,7 @@
     "Latte": 759,
     "Less": 39,
     "LFE": 1711,
-    "Liquid": 1234,
+    "Liquid": 633,
     "Literate Agda": 478,
     "Literate CoffeeScript": 275,
     "LiveScript": 123,
@@ -62818,7 +62641,7 @@
     "Latte": 2,
     "Less": 1,
     "LFE": 4,
-    "Liquid": 5,
+    "Liquid": 2,
     "Literate Agda": 1,
     "Literate CoffeeScript": 1,
     "LiveScript": 1,
@@ -62919,5 +62742,5 @@
     "YAML": 2,
     "Zephir": 2
   },
-  "md5": "127e4abbd61c3dfa815c46752237e812"
+  "md5": "0ab9fe87b3d811ca32ad705d2653b98f"
 }
\ No newline at end of file
diff --git a/samples/Liquid/feed.xml b/samples/Liquid/feed.xml
deleted file mode 100644
index edaae4a0..00000000
--- a/samples/Liquid/feed.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"
-  xmlns:content="http://purl.org/rss/1.0/modules/content/"
-  xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:atom="http://www.w3.org/2005/Atom"
-  xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-  xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
-  >
-  <channel>
-    <title xml:lang="en">Jekyll • Simple, blog-aware, static sites</title>
-    <atom:link type="application/atom+xml" href="http://jekyllrb.com/feed.xml" rel="self"/>
-    <link>http://jekyllrb.com/</link>
-    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
-    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
-    <language>en-US</language>
-    <generator>Jekyll v{{ jekyll.version }}</generator>
-    <description>Transform your plain text into static websites and blogs.</description>
-    <image>
-      <description>Transform your plain text into static websites and blogs.</description>
-      <url>http://jekyllrb.com/img/logo-rss.png</url>
-      <title>Jekyll • Simple, blog-aware, static sites</title>
-      <link>http://jekyllrb.com/</link>
-      <width>144</width>
-      <height>73</height>
-    </image>
-    {% for post in site.posts %}
-    <item>
-      <title>{{ post.title | xml_escape}}</title>
-      <link>http://jekyllrb.com{{ post.url }}</link>
-      <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-      <dc:creator>{{ post.author }}</dc:creator>
-      {% for tag in post.tags %}
-      <category>{{ tag | xml_escape }}</category>
-      {% endfor %}
-      {% for cat in post.categories %}
-      <category>{{ cat | xml_escape }}</category>
-      {% endfor %}
-      <guid isPermaLink="true">http://jekyllrb.com{{ post.url }}</guid>
-      <description>{{ post.content | xml_escape }}</description>
-    </item>
-    {% endfor %}
-  </channel>
-</rss>
\ No newline at end of file
diff --git a/samples/Liquid/jekyll.html b/samples/Liquid/jekyll.html
deleted file mode 100644
index fba31c3d..00000000
--- a/samples/Liquid/jekyll.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<section class="intro">
-  <div class="grid">
-    <div class="unit whole center-on-mobiles">
-      <p class="first">Transform your plain text into static&nbsp;websites and&nbsp;blogs.</p>
-    </div>
-  </div>
-</section>
-<section class="features">
-  <div class="grid">
-    <div class="unit one-third">
-      <h2>Simple</h2>
-      <p>
-        No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
-      </p>
-      <a href="/docs/usage/">How Jekyll works &rarr;</a>
-    </div>
-    <div class="unit one-third">
-      <h2>Static</h2>
-      <p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
-      <a href="/docs/templates/">Jekyll template guide &rarr;</a>
-    </div>
-    <div class="unit one-third">
-      <h2>Blog-aware</h2>
-      <p>
-        Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
-      </p>
-      <a href="/docs/migrations/">Migrate your blog &rarr;</a>
-    </div>
-    <div class="clear"></div>
-  </div>
-</section>
-<section class="quickstart">
-  <div class="grid">
-    <div class="unit golden-small center-on-mobiles">
-      <h4>Get up and running <em>in&nbsp;seconds</em>.</h4>
-    </div>
-    <div class="unit golden-large code">
-      <p class="title">Quick-start Instructions</p>
-      <div class="shell">
-        <p class="line">
-          <span class="path">~</span>
-          <span class="prompt">$</span>
-          <span class="command">gem install jekyll</span>
-        </p>
-        <p class="line">
-          <span class="path">~</span>
-          <span class="prompt">$</span>
-          <span class="command">jekyll new my-awesome-site</span>
-        </p>
-        <p class="line">
-          <span class="path">~</span>
-          <span class="prompt">$</span>
-          <span class="command">cd my-awesome-site</span>
-        </p>
-        <p class="line">
-          <span class="path">~/my-awesome-site</span>
-          <span class="prompt">$</span>
-          <span class="command">jekyll serve</span>
-        </p>
-        <p class="line">
-          <span class="output"># => Now browse to http://localhost:4000</span>
-        </p>
-      </div>
-    </div>
-    <div class="clear"></div>
-  </div>
-</section>
-<section class="free-hosting">
-  <div class="grid">
-    <div class="unit whole">
-      <div class="grid pane">
-        <div class="unit whole center-on-mobiles">
-          <img src="img/octojekyll.png" width="300" height="251" alt="Free Jekyll hosting on GitHub Pages">
-          <div class="pane-content">
-            <h2 class="center-on-mobiles"><strong>Free hosting</strong> with GitHub Pages</h2>
-            <p>Sick of dealing with hosting companies? <a href="http://pages.github.com/">GitHub Pages</a> are <em>powered by Jekyll</em>, so you can easily deploy your site using GitHub for free&mdash;<a href="https://help.github.com/articles/setting-up-a-custom-domain-with-pages">custom domain name</a> and&nbsp;all.</p>
-            <a href="http://pages.github.com/">Learn more about GitHub Pages &rarr;</a>
-          </div>
-        </div>
-        <div class="clear"></div>
-      </div>
-    </div>
-  </div>
-</section>
\ No newline at end of file
diff --git a/samples/Liquid/posts.json b/samples/Liquid/posts.json
deleted file mode 100644
index 9633fd93..00000000
--- a/samples/Liquid/posts.json
+++ /dev/null
@@ -1 +0,0 @@
-{{ site.posts | jsonify }}