diff --git a/index.html b/index.html
index 0618f06..97ca671 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 title: Welcome to the Wiki
 layout: default
 ---
-<h3>Welcome to GitHub Pages.</h3>
+<h3>Latest posts:</h3>
 
 <ul>
 {% for post in paginator.posts %}
@@ -13,7 +13,7 @@ layout: default
 {% if paginator.total_pages > 1 %}
 <div class="pagination">
   {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&laquo; Newer</a>
+    <a href="{{ paginator.previous_page_path | prepend: site.url | replace: '//', '/' }}">&laquo; Newer</a>
   {% else %}
     <span>&laquo; Newer</span>
   {% endif %}
@@ -22,20 +22,21 @@ layout: default
     {% if page == paginator.page %}
       <em>{{ page }}</em>
     {% elsif page == 1 %}
-      <a href="{{ '/index.html' | prepend: site.baseurl | replace: '//', '/' }}">{{ page }}</a>
+      <a href="{{ '/index.html' | prepend: site.url | replace: '//', '/' }}">{{ page }}</a>
     {% else %}
-      <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
+      <a href="{{ site.paginate_path | prepend: site.url | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
     {% endif %}
   {% endfor %}
 
   {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">Older &raquo;</a>
+    <a href="{{ paginator.next_page_path | prepend: site.url | replace: '//', '/' }}">Older &raquo;</a>
   {% else %}
     <span>Older &raquo;</span>
   {% endif %}
 </div>
 {% endif %}
 
+{% comment %}
 All posts:
 
 <ul>
@@ -56,3 +57,4 @@ Categories:
   </li>
 {% endfor %}
 </ul>
+{% endcomment %}
diff --git a/search.html b/search.html
deleted file mode 100644
index 2ee666a..0000000
--- a/search.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Search
----
-<script>
-  (function() {
-    var cx = '005859900804634181508:3bt_l7jyk2e';
-    var gcse = document.createElement('script');
-    gcse.type = 'text/javascript';
-    gcse.async = true;
-    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-        '//www.google.com/cse/cse.js?cx=' + cx;
-    var s = document.getElementsByTagName('script')[0];
-    s.parentNode.insertBefore(gcse, s);
-  })();
-</script>
-<gcse:search></gcse:search>
-