diff --git a/templates/404.html b/templates/404.html
index fc0dd67..2e35ee5 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}List of survex files{% endblock %}
 
 {% block content %}
diff --git a/templates/expedition.html b/templates/expedition.html
index f8a38fc..148b25b 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}Expedition {{expedition.name}}{% endblock %}
 {% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
 
diff --git a/templates/pathsreport.html b/templates/pathsreport.html
index 15e7f37..d977c6b 100644
--- a/templates/pathsreport.html
+++ b/templates/pathsreport.html
@@ -1,16 +1,9 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}Troggle paths report{% endblock %}
 
 {% block content %}
-
 <h1>Expo Troggle paths report</h1>
-
-
 <p>
-
 <table style="font-family: Consolas, Lucida Console, monospace;">
 <tr><th>Code</th><th>Path</th><th>Type</th></tr>
 {% for c,p,t in bycodeslist %}
diff --git a/templates/personexpedition.html b/templates/personexpedition.html
index ddaad35..e04952e 100644
--- a/templates/personexpedition.html
+++ b/templates/personexpedition.html
@@ -1,7 +1,5 @@
 {% extends "base.html" %}
-
-{% load link %}
-
+{% load wiki_markup %}
 {% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %}
 
 
diff --git a/templates/statistics.html b/templates/statistics.html
index 97219ba..f4b95e1 100644
--- a/templates/statistics.html
+++ b/templates/statistics.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}Expo statistics{% endblock %}
 
 {% block content %}
diff --git a/templates/svxcaveseveral.html b/templates/svxcaveseveral.html
index 9e7d7fa..e855600 100644
--- a/templates/svxcaveseveral.html
+++ b/templates/svxcaveseveral.html
@@ -1,14 +1,9 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}List of survex files{% endblock %}
 
 {% block content %}
     <!-- the only thing passed into this template is a list of object identifiers for caves.
     All the processing to extract the survex subdriectories and survex files is done in this template -->
-
-
 {% for cave in caves %}
 
     {% autoescape off %}
diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html
index ff54c40..0e64bcf 100644
--- a/templates/svxcavesingle.html
+++ b/templates/svxcavesingle.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}List of survex files{% endblock %}
 
 {% block content %}
@@ -9,7 +6,7 @@
 {% autoescape off %}
 <h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - kataster:{{cave}}</h1>
 {% endautoescape %}
-<!-- the only thing passed into this temnlate is the object identifier for a cave.
+<!-- the only thing passed into this template is the object identifier for a cave.
 All the processing to extract the survex subdriectories and survex files is done in this template -->
 
 <p>Cave description: <a href="/{{cave.url}}">{{cave.url}}</a>
diff --git a/templates/svxcavesingle404.html b/templates/svxcavesingle404.html
index 70dede9..0d765cb 100644
--- a/templates/svxcavesingle404.html
+++ b/templates/svxcavesingle404.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}List of survex files{% endblock %}
 
 {% block content %}
@@ -26,6 +23,4 @@ the survex files with everything else.
 <p>The process for registering a new cave is documented in 
 <a href="/handbook/survey/caveentry.html">this part of the survey handbook</a>.
 <p>
-
 {% endblock %}
-
diff --git a/templates/svxfilecavelist.html b/templates/svxfilecavelist.html
index aae2b00..54dac0e 100644
--- a/templates/svxfilecavelist.html
+++ b/templates/svxfilecavelist.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-
-{% load link %}
-
 {% block title %}List of survex files{% endblock %}
 
 {% block content %}