diff --git a/_config.yml b/_config.yml
index ba171a8..dd02f62 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,13 +20,6 @@ redcarpet:
     - html_toc
     - tables
 
-defaults:
-  -
-    scope:
-      path: "doc"
-    values:
-      layout: doc
-
 # OLD from jekyll 2.x
 #highlighter: pygments
 
diff --git a/_layouts/deps.html b/_layouts/deps.html
deleted file mode 100644
index e1b13c2..0000000
--- a/_layouts/deps.html
+++ /dev/null
@@ -1,111 +0,0 @@
----
-layout: default
----
-
-<div class="container-fluid" style="margin-top:20px">
-  <div class="container-fluid">
-    <div class="row">
-      <ol class="breadcrumb">
-        <li><a href="{{site.baseurl}}/">Home</a></li>
-        <li class="active">Packages</li>
-      </ol>
-    </div>
-    <div class="row">
-      {% include distro_switch.html %}
-    </div>
-    <div class="row">
-      &nbsp;
-    </div>
-    <div class="panel panel-default">
-      <div class="panel-heading"><h3 class="panel-title">OS Dependencies</h3></div>
-      <div class="table-responsive">
-        <table class="table table-condensed table-striped table-hover">
-          <thead>
-            <tr>
-              <th style="text-align: center;"><span class="glyphicon glyphicon-th"></span></th>
-              <th style="text-align: center;">
-                {% if page.sort_id == 'released' %}
-                  <span class="glyphicon glyphicon-flash selected-sort-label"></span>
-                {% else %}
-                  <a href="{{site.baseurl}}/packages/page/1/released" class="unselected-sort-label glyphicon glyphicon-flash"></a>
-                {% endif %}
-              </th>
-              <th style="text-align: center;">
-                {% if page.sort_id == 'time' %}
-                  <span class="glyphicon glyphicon-time selected-sort-label"></span>
-                {% else %}
-                  <a href="{{site.baseurl}}/packages/page/1/time" class="unselected-sort-label glyphicon glyphicon-time"></a>
-                {% endif %}
-              </th>
-              <th style="text-align: left;">
-                {% if page.sort_id == '' %}
-                  <span class="selected-sort-label">Name</span>
-                {% else %}
-                  <a class="unselected-sort-label" href="{{site.baseurl}}/packages/page/1">Name</a>
-                {% endif %}
-              </th>
-              <th width="100%">Description</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for package in page.list_alpha %}
-              {% assign r = package[1].repos[distro].snapshots[distro] %}
-              {% assign p = package[1].snapshots[distro] %}
-              {% assign n_instances = package[1].instances | size %}
-              <tr>
-                <td title="View Package Instances" data-toggle="tooltip" data-placement="left" align="center">
-                  <a href="{{site.baseurl}}/packages/{{package[0]}}" class="label label-{% if n_instances > 1 %}primary{% else %}default{% endif %}">
-                      {{n_instances}}
-                  </a>
-                </td>
-                {% if p %}
-                  {% if r.released %}
-                    <td class="text-center">
-                      <span title="Released in {{distro}}" data-toggle="tooltip" data-placement="left" class="glyphicon glyphicon-flash"></span>
-                    </td>
-                  {% else %}
-                    <td title="Not released in {{distro}}" data-toggle="tooltip" data-placement="left" class="text-center">
-                      <span class="glyphicon glyphicon-none"></span>
-                    </td>
-                  {% endif %}
-                  </td>
-                  <td>
-                    <span class="label label-default">{{ r.data.last_commit_time }}</span>
-                  </td>
-                  <td>
-                    <a href="/p/{{package[0]}}">{{ package[0] }}</a>
-                  </td>
-                  <td>
-                    <div class="truncate">
-                      <div class="spacer">{{ p.data.description }}</div>
-                      <div class="content">{{ p.data.description }}</div>
-                      <span>&nbsp;</span>
-                    </div>
-                  </td>
-                {% else %}
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td>
-                    <a class="inactive" href="/p/{{package[0]}}">{{ package[0] }}</a>
-                  </td>
-                  <td></td>
-                {% endif %}
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    </div>
-    <div class="row text-center">
-      {% include package_pager.html %}
-    </div>
-  </div>
-</div>
-
-<script src="/js/distro_switch.js"></script>
-<script type="text/javascript">
-  $(document).ready(function() {
-    setupDistroSwitch("{{ site.distros[0] }}");
-  });
-</script>
diff --git a/_layouts/distro_switch_tabs.html b/_layouts/distro_switch_tabs.html
deleted file mode 100644
index 85b5ba1..0000000
--- a/_layouts/distro_switch_tabs.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<ul class="nav nav-tabs nav-justified" id="distro-switch">
-
-  <!-- Current distros -->
-  {% for distro in site.distros %}
-  <li role="presentation"><a href="#{{ distro }}" role="tab" data-toggle="tab">{{ distro }}</a></li>
-  {% endfor %}
-
-  <!-- Older distros -->
-  <li role="presentation" class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
-      Older <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu" role="menu">
-      {% for distro in site.old_distros %}
-        <li><a href="#{{ distro }}">{{ distro }}</a></li>
-      {% endfor %}
-    </ul>
-  </li>
-
-</ul>
diff --git a/_layouts/doc.html b/_layouts/doc.html
deleted file mode 100644
index ca5638f..0000000
--- a/_layouts/doc.html
+++ /dev/null
@@ -1,35 +0,0 @@
----
-layout: default
----
-
-<div class="container-fluid" style="margin-top: 20px">
-  <div class="row">
-    <ol class="breadcrumb">
-      <li><a href="{{site.baseurl}}/">Home</a></li>
-      {% for ancestor_page in page.ancestor_pages %}
-      <li>
-        <a href="{{ site.baseurl }}{{ ancestor_page.url }}">
-          {{ ancestor_page.title }}
-        </a>
-      </li>
-      {% endfor %}
-      <li class="active">{{ page.title }}</li>
-    </ol>
-  </div>
-  <div class="row">
-    <nav class="col-md-4 well">
-      <h3 style="margin-top: 10px;">Index</h3>
-      {% assign current_page = page %}
-      {% assign root_page = page.root_page %}
-      {% include pages_index.html %}
-    </nav>
-    <div class="col-md-8">
-      <a type="button" href="{{ page.edit_url }}"
-         class="btn btn-success pull-right"
-         style="margin-top: 20px;">
-        Edit on Github
-      </a>
-      {{ content }}
-    </div>
-  </div>
-</div>
diff --git a/_layouts/post.html b/_layouts/post.html
deleted file mode 100644
index 27c576f..0000000
--- a/_layouts/post.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default
----
-<div class="container-fluid">
-<div class="row">
-<div class="col-md-8 post">
-  <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
-  </header>
-
-  <article class="post-content">
-    {{ content }}
-  </article>
-</div>
-</div>
-</div>
diff --git a/_layouts/repo_instance_distro.html b/_layouts/repo_instance_distro.html
deleted file mode 100644
index b91af1c..0000000
--- a/_layouts/repo_instance_distro.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
----
-layout: default
----
-
-<div class="container-fluid" style="margin:20px">
-  <div class="row">
-    <ol class="breadcrumb">
-      <li><a href="{{site.baseurl}}/">Home</a></li>
-      <li><a href="{{site.baseurl}}/repos">Repos</a></li>
-      <li class="active">{{ page.repo.name }}</li>
-    </ol>
-  </div>
-  <div class="row">
-    name: <b>{{ page.repo.name }}</b>
-    <br>
-    description: <em>{{ page.repo.description }}</em>
-    <br>
-    tags: {% for tag in page.repo.tags %}<span class="label label-default">{{ tag }}</span> {% endfor %}
-  </div>
-  <div class="row">
-    &nbsp;
-  </div>
-  <div class="row">
-    {% include instance_switch.html %}
-  </div>
-  <div class="row">
-    {% include distro_switch.html %}
-  </div>
-  <div class="row">
-    &nbsp;
-  </div>
-  <div class="row">
-    <ul class="nav nav-tabs" id="content-tabs">
-      <!-- Current distros -->
-      <li role="presentation" class="active"><a href="#readme">
-        README
-      </a></li>
-      <li role="presentation" class=""><a href="#packages">
-        Packages
-      </a></li>
-      <li role="presentation" class="disabled"><a href="#repo-info">
-        Repository Info
-      </a></li>
-      <li role="presentation" class="disabled"><a href="#related">
-        Related
-      </a></li>
-    </ul>
-
-  </div>
-  <div id="distro-switch-content" class="tab-content">
-    {% for variant in page.repo_variants %}
-      <div id="{{variant[0]}}-tab" class="variant variant-{{ variant[0] }}">
-
-        {% for distro in page.all_distros %}
-          <div id="{{ prefix }}tab" class="hide distro distro-{{distro}}">
-            {% if variant[1].distros contains distro %}
-
-              <div class="tab-content" style="margin: 20px">
-                <div id="readme">
-                  {{ variant[1].distros[distro].readme_rendered }}
-                </div>
-                <div id="packages">
-                  <ul>
-                    {% for p in variant[1].distros[distro].packages %}
-                      <li>{{ p.name }} -- {{p.version}}</li>
-                    {% endfor %}
-                  </ul>
-                </div>
-              </div>
-
-
-            {% else %}
-              <p><em>No known branch for <b>{{distro}}</b>.</em></p>
-            {% endif %}
-          </div>
-        {% endfor %}
-      </div>
-    {% endfor %}
-  <div class="row">
-    &nbsp;
-  </div>
-</div>
-
-<script src="{{ '/js/repo_switch.js' | prepend: site.baseurl }}"></script>
-
-<script>
-$(document).ready(function() {
-  setupDistroSwitch("{{ site.distros[0] }}");
-  $('#content-tabs a').click(
-    function (e) {
-      //e.preventDefault();
-      $(this).tab('show');
-      console.log(this)
-    }
-  );
-});
-</script>
-
diff --git a/_layouts/repo_variant_distro.html b/_layouts/repo_variant_distro.html
deleted file mode 100644
index d200831..0000000
--- a/_layouts/repo_variant_distro.html
+++ /dev/null
@@ -1,97 +0,0 @@
----
-layout: default
----
-
-<div class="container-fluid" style="margin:20px">
-  <div class="row">
-    <ol class="breadcrumb">
-      <li><a href="{{site.baseurl}}/">Home</a></li>
-      <li><a href="{{site.baseurl}}/repos">Repos</a></li>
-      <li class="active">{{ page.repo.name }}</li>
-    </ol>
-  </div>
-  <div class="row">
-    name: <b>{{ page.repo.name }}</b>
-    <br>
-    description: <em>{{ page.repo.description }}</em>
-    <br>
-    tags: {% for tag in page.repo.tags %}<span class="label label-default">{{ tag }}</span> {% endfor %}
-  </div>
-  <div class="row">
-    &nbsp;
-  </div>
-  <div class="row">
-    {% include instance_switch.html %}
-  </div>
-  <div class="row">
-    {% include distro_switch.html %}
-  </div>
-  <div class="row">
-    &nbsp;
-  </div>
-  <div class="row">
-    <ul class="nav nav-tabs" id="content-tabs">
-      <!-- Current distros -->
-      <li role="presentation" class="active"><a href="#readme">
-        README
-      </a></li>
-      <li role="presentation" class=""><a href="#packages">
-        Packages
-      </a></li>
-      <li role="presentation" class="disabled"><a href="#repo-info">
-        Repository Info
-      </a></li>
-      <li role="presentation" class="disabled"><a href="#related">
-        Related
-      </a></li>
-    </ul>
-
-  </div>
-  <div id="distro-switch-content" class="tab-content">
-    {% for variant in page.repo_variants %}
-      <div id="{{variant[0]}}-tab" class="variant variant-{{ variant[0] }}">
-
-        {% for distro in page.all_distros %}
-          <div id="{{ prefix }}tab" class="distro distro-{{distro}}">
-            {% if variant[1].distros contains distro %}
-
-              <div class="tab-content" style="margin: 20px">
-                <div id="readme">
-                  {{ variant[1].distros[distro].readme_rendered }}
-                </div>
-                <div id="packages">
-                  <ul>
-                    {% for p in variant[1].distros[distro].packages %}
-                      <li>{{ p.name }} -- {{p.version}}</li>
-                    {% endfor %}
-                  </ul>
-                </div>
-              </div>
-
-
-            {% else %}
-              <p><em>No known branch for <b>{{distro}}</b>.</em></p>
-            {% endif %}
-          </div>
-        {% endfor %}
-      </div>
-    {% endfor %}
-  <div class="row">
-    &nbsp;
-  </div>
-</div>
-
-<script src="{{ '/js/repo_switch.js' | prepend: site.baseurl }}"></script>
-
-<script>
-$(document).ready(function() {
-  setupDistroSwitch("{{ site.distros[0] }}");
-  $('#content-tabs a').click(
-    function (e) {
-      //e.preventDefault();
-      $(this).tab('show');
-      console.log(this)
-    }
-  );
-});
-</script>