diff --git a/glossary.md b/glossary.md
index 3c8436c7b5..67d904b1e7 100644
--- a/glossary.md
+++ b/glossary.md
@@ -17,8 +17,6 @@ To get a specific entry while writing a page in the docs, enter Liquid text
 like so:
 {{ site.data.glossary["aufs"] }}
 -->
-<span id="glossaryMatch"></span>
-<span id="topicMatch"></span>
 <table>
   <thead>
     <tr><th>Term</th><th>Definition</th></tr>
diff --git a/js/glossary.js b/js/glossary.js
index 4d02ca6b66..439e0f1681 100644
--- a/js/glossary.js
+++ b/js/glossary.js
@@ -1,6 +1,6 @@
 var glossary = [
 {%- for entry in site.data.glossary -%}
-    {"term": {{ entry[0] | jsonify }}, "def": {{ entry[1] | markdownify | replace:'href="#','href="/glossary/?term=' | jsonify }}}
+    {"term": {{ entry[0] | jsonify }}, "def": {{ entry[1] | markdownify | jsonify }}}
     {%- unless forloop.last -%},{%- endunless -%}
 {%- endfor -%}
 ]
diff --git a/js/search.js b/js/search.js
index 95af29fdce..2e5872b04f 100644
--- a/js/search.js
+++ b/js/search.js
@@ -191,66 +191,4 @@ function queryString()
     return vars;
 }
 
-function renderTopicsByTagTable(tagToLookup,divID)
-{
-  var matchingPages = new Array();
-  for (i=0;i<pages.length;i++)
-  {
-    thisPage = pages[i];
-    if (thisPage.keywords)
-    {
-      var keywordArray = thisPage.keywords.toString().split(",");
-      for (n=0;n<keywordArray.length;n++)
-      {
-        if (keywordArray[n].trim().toLowerCase()==tagToLookup.toLowerCase())
-        {
-          matchingPages.push(i); // log the id of the page w/matching keyword
-        }
-      }
-    }
-  }
-  var pagesOutput = new Array();
-  if (matchingPages.length > 0)
-  {
-    pagesOutput.push("<h2>Pages tagged with: " + tagToLookup + "</h2>");
-    pagesOutput.push("<table><thead><tr><td>Page</td><td>Description</td></tr></thead><tbody>");
-    for(i=0;i<matchingPages.length;i++) {
-      thisPage = pages[matchingPages[i]];
-      pagesOutput.push("<tr><td><a href='" + thisPage.url + "'>" + thisPage.title + "</a></td><td>" + thisPage.description + "</td></tr>");
-    }
-    pagesOutput.push("</tbody></table>");
-  }
-  $("#" + divID).html(pagesOutput.join(""));
-}
-
-var tagToLookup;
-function renderTagsPage()
-{
-  if(window.location.pathname.indexOf("/glossary/")>-1 || window.location.pathname.indexOf("/search/")>-1)
-  {
-    if (window.location.pathname.indexOf("/glossary/")>-1)
-    {
-      // Get ?term=<value>
-      tagToLookup = decodeURI(queryString().term);
-      $("#keyword").html(tagToLookup);
-    }
-    else
-    {
-      // Get ?q=<value>
-      tagToLookup = decodeURI(queryString().q);
-    }
-    // Get the term and definition
-    for (i=0;i<glossary.length;i++)
-    {
-      if (glossary[i].term.toLowerCase()==tagToLookup.toLowerCase())
-      {
-        var glossaryOutput = glossary[i].def;
-      }
-    }
-    if (glossaryOutput) {
-      $("#glossaryMatch").html("<h2>Definition of: " + tagToLookup + "</h2>" + glossaryOutput);
-    }
-    renderTopicsByTagTable(tagToLookup,"topicMatch",true);
-  }
-}
 $(document).ready(bindSearch);