diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html
index 222550cc9..1e55208fb 100644
--- a/handbook/computing/yourlaptop.html
+++ b/handbook/computing/yourlaptop.html
@@ -133,7 +133,7 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
 <p>Quick <a href="../manual.html#quickstart">reminders for using rsync and mercurial</a> at the command line.
 
 <h3>Complementary tools</h3>
-<p>When maintaining the HTML files in the  expo handbook a link-checker is useful to report bad URLs (links to external sites go bad regularly) and to find orphaned pages with no in-links. The website has <a href="http://keldos.klebos.net/LinkScans/TUNNEL-wiki-link-report.html">about 2,000 internal URLs</a> in just the Tunnel wiki section alone.
+<p>When maintaining the HTML files in the  expo handbook a link-checker is useful to report bad URLs (links to external sites go bad regularly) and to find orphaned pages with no in-links. The website has <a href="https://www.klebos.net/subdomains/keldos/LinkScans/TUNNEL-wiki-link-report.html">about 2,000 internal URLs</a> in just the Tunnel wiki section alone.
 <ul>
 <li><a href="https://www.brokenlinkcheck.com/">Online brokenlinkcheck tool</a> - does not install on your laptop
 <li><a href="http://home.snafu.de/tilman/xenulink.html">Xenu Link Sleuth</a> - on Windows
diff --git a/handbook/geartape.html b/handbook/geartape.html
index 15fa4bc7d..185533bd4 100644
--- a/handbook/geartape.html
+++ b/handbook/geartape.html
@@ -264,7 +264,7 @@ on a particular combination of colours of electrical insulation tape, and label
 <em>absolutely everything</em> you own with the stuff. The table above shows combinations already taken. 
 
 For other CUCC colour combinations already in use see <a
-href="http://www.srcf.ucam.org/caving/wiki/Gear_Tape_Colours">CUCC gear tape</a>. 
+href="https://caving.soc.srcf.net/Gear/Tape/">CUCC gear tape</a>. 
 
 
 <p> Tape
diff --git a/years/2008/gearforexpo.html b/years/2008/gearforexpo.html
index 7c6cacb67..2c1abebb1 100644
--- a/years/2008/gearforexpo.html
+++ b/years/2008/gearforexpo.html
@@ -6,8 +6,7 @@
 		<meta name="keywords" content="Expo 2008/What do I need for Expo?,Ollie s,Ed259,Frank,Duncan.collis,Custom light construction,Ed259" />
 		<link rel="shortcut icon" href="/caving/favicon.ico" />
 		<link rel="search" type="application/opensearchdescription+xml" href="/caving/wiki/opensearch_desc.php" title="CUCCWiki (en)" />
-		<link rel="alternate" type="application/rss+xml" title="CUCCWiki RSS Feed" href="http://www.camcaving/caving/wiki/index.php?title=Special:RecentChanges&amp;feed=rss" />
-		<link rel="alternate" type="application/atom+xml" title="CUCCWiki Atom Feed" href="http://www.camcaving/caving/wiki/index.php?title=Special:RecentChanges&amp;feed=atom" />
+	
     <title>Expo 2008/What do I need for Expo? - Cambridge University Caving Club</title>
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "/caving/wiki/skins/kindofblue/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="/caving/wiki/skins/common/commonPrint.css" />
@@ -111,7 +110,7 @@ One of those super cheap nylon rain coats prized by church walking groups on tri
 </li></ul>
 </li></ul>
 <p>The gimp top was first used as a way of staying warm at the top of pitches however people soon started taking off their oversuit and using the gimp top when moving fast and ascending on dry pitches.  
-</p><p>This has been recomended by people who cave extensivly in the hill 20 miles west of our hill. <a href="/caving/wiki/index.php?title=User:Frank&amp;action=edit&amp;redlink=1" class="new" title="User:Frank (not yet written)">frank</a>
+</p><p>This has been recomended by people who cave extensivly in the hill 20 miles west of our hill. 
 </p>
 <!-- 
 NewPP limit report
@@ -123,7 +122,7 @@ Expensive parser function count: 0/100
 
 <!-- Saved in parser cache with key cucaving:pcache:idhash:228-0!1!0!!en!2!edit=0 and timestamp 20090101013804 -->
 <div class="printfooter">
-Retrieved from "<a href="http://camcaving.uk/Documents/Expo/Legacy/2008/What_do_I_need_for_Expo%3F">http://camcaving.uk/Documents/Expo/Legacy/2008/What_do_I_need_for_Expo%3F</a>"</div>
+Retrieved from "<u>"http://camcaving.uk/Documents/Expo/Legacy/2008/What_do_I_need_for_Expo%3F</u></div>
 	    	    <!-- end content -->
 	    <div class="visualClear"></div>
 	  </div>
@@ -137,28 +136,7 @@ Retrieved from "<a href="http://camcaving.uk/Documents/Expo/Legacy/2008/What_do_
 	 </div>
 	<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
 		<div class='portlet' id='p-navigation'>
-	  <h5>Navigation</h5>
-	  <div class='pBody'>
-	    <ul>
-	    	      <li id="n-mainpage"><a href="/caving/wiki/Main_Page">Main Page</a></li>
-	     	      <li id="n-Calendar"><a href="/caving/wiki/Calendar">Calendar</a></li>
-	     	      <li id="n-Socials"><a href="/caving/wiki/Socials">Socials</a></li>
-	     	      <li id="n-Costs"><a href="/caving/wiki/Costs">Costs</a></li>
-	     	      <li id="n-Gear"><a href="/caving/wiki/Gear">Gear</a></li>
-	     	      <li id="n-Safety"><a href="/caving/wiki/Safety">Safety</a></li>
-	     	      <li id="n-Library"><a href="/caving/wiki/Library">Library</a></li>
-	     	      <li id="n-Training"><a href="/caving/wiki/Training">Training</a></li>
-	     	      <li id="n-Photos"><a href="/caving/wiki/Photos">Photos</a></li>
-	     	      <li id="n-Email-lists"><a href="/caving/wiki/Email_lists">Email lists</a></li>
-	     	      <li id="n-Expo"><a href="/caving/wiki/Expo">Expo</a></li>
-	     	      <li id="n-Ardèche"><a href="/caving/wiki/Ard%C3%A8che">Ardèche</a></li>
-	     	      <li id="n-ExCS"><a href="/caving/wiki/Excs">ExCS</a></li>
-	     	      <li id="n-Archive"><a href="/caving/wiki/Archive">Archive</a></li>
-	     	      <li id="n-Contacts"><a href="/caving/wiki/Contacts">Contacts</a></li>
-	     	      <li id="n-Majorca-2009"><a href="/caving/wiki/Majorca_2009/">Majorca 2009</a></li>
-	     	      <li id="n-Expo-2008"><a href="/caving/wiki/Expo_2008/">Expo 2008</a></li>
-	     	      <li id="n-Expo-2009"><a href="/caving/wiki/Expo_2009/">Expo 2009</a></li>
-	     	    </ul>
+
 	  </div>
 	</div>
 		<div class="portlet" id="p-tb">
@@ -166,14 +144,10 @@ Retrieved from "<a href="http://camcaving.uk/Documents/Expo/Legacy/2008/What_do_
 	      </div><!-- end of the left (by default at least) column -->
       <div class="visualClear"></div>
       <div id="footer">
-		<table width = "100%">
-			<tr><td width="5%" align="left" nowrap='nowrap'></td>
-				<td align="center">
-	    This page was last modified on 30 May 2008, at 13:09. - 	  This page has been accessed 269 times. - 	  	  	  	  <a href="/caving/wiki/CUCCWiki:General_disclaimer" title="CUCCWiki:General disclaimer">Disclaimers</a> - 	  <a href="/caving/wiki/CUCCWiki:About" title="CUCCWiki:About">About CUCCWiki</a>	</td>
-			<td width="5%" align="right" nowrap='nowrap'><div id="f-poweredbyico"><a href="http://www.mediawiki.org/"><img src="/caving/wiki/skins/common/images/poweredby_mediawiki_88x31.png" alt="Powered by MediaWiki" /></a></div></td></tr></table>
+		
       </div>
 	
-		<script type="text/javascript">if (window.runOnloadHook) runOnloadHook();</script>
+			<!-- hand edited to remove bad links 2019-12-11 by philip sargent -->
 </div>
 </body>
 </html>
diff --git a/years/2008/jobs.html b/years/2008/jobs.html
index 8ecce6a39..5e633c3e9 100644
--- a/years/2008/jobs.html
+++ b/years/2008/jobs.html
@@ -11,41 +11,8 @@
     <title>Expo 2008/Committee Formation - Cambridge University Caving Club</title>
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "/caving/wiki/skins/kindofblue/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="/caving/wiki/skins/common/commonPrint.css" />
-    <!--[if lt IE 5.5000]><style type="text/css">@import "/caving/wiki/skins/kindofblue/IE50Fixes.css";</style><![endif]-->
-    <!--[if IE 5.5000]><style type="text/css">@import "/caving/wiki/skins/kindofblue/IE55Fixes.css";</style><![endif]-->
-    <!--[if gte IE 6]><style type="text/css">@import "/caving/wiki/skins/kindofblue/IE60Fixes.css";</style><![endif]-->
-    <!--[if IE]><script type="text/javascript" src="/caving/wiki/skins/common/IEFixes.js"></script>
-    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    
-    <script type= "text/javascript">/*<![CDATA[*/
-var skin = "kindofblue";
-var stylepath = "/caving/wiki/skins";
-var wgArticlePath = "/caving/wiki/$1";
-var wgScriptPath = "/caving/wiki";
-var wgScript = "/caving/wiki/index.php";
-var wgVariantArticlePath = false;
-var wgActionPaths = [];
-var wgServer = "http://www.camcaving";
-var wgCanonicalNamespace = "";
-var wgCanonicalSpecialPageName = false;
-var wgNamespaceNumber = 0;
-var wgPageName = "Expo_2008/Committee_Formation";
-var wgTitle = "Expo 2008/Committee Formation";
-var wgAction = "view";
-var wgArticleId = "207";
-var wgIsArticle = true;
-var wgUserName = null;
-var wgUserGroups = null;
-var wgUserLanguage = "en";
-var wgContentLanguage = "en";
-var wgBreakFrames = false;
-var wgCurRevisionId = "762";
-var wgVersion = "1.13.2";
-var wgEnableAPI = true;
-var wgEnableWriteAPI = false;
-var wgRestrictionEdit = [];
-var wgRestrictionMove = [];
-/*]]>*/</script>
+ 
+  
 
 		<script type="text/javascript" src="/caving/wiki/skins/common/wikibits.js?164"><!-- wikibits js --></script>
 		<script type="text/javascript" src="/caving/wiki/index.php?title=-&amp;action=raw&amp;gen=js&amp;useskin=kindofblue"><!-- site js --></script>
@@ -120,7 +87,7 @@ Expensive parser function count: 0/100
 
 <!-- Saved in parser cache with key cucaving:pcache:idhash:207-0!1!0!!en!2!edit=0 and timestamp 20090102003722 -->
 <div class="printfooter">
-Retrieved from "<a href="http://camcaving.uk/Documents/Expo/Legacy/2008/Committee_Formation">http://camcaving.uk/Documents/Expo/Legacy/2008/Committee_Formation</a>"</div>
+Retrieved from "<u>http://camcaving.uk/Documents/Expo/Legacy/2008/Committee_Formation"></u>"</div>
 	    	    <!-- end content -->
 	    <div class="visualClear"></div>
 	  </div>
@@ -132,31 +99,8 @@ Retrieved from "<a href="http://camcaving.uk/Documents/Expo/Legacy/2008/Committe
 	    href="/caving/wiki/Main_Page"
 	    title="Main Page"></a>
 	 </div>
-	<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
 		<div class='portlet' id='p-navigation'>
-	  <h5>Navigation</h5>
-	  <div class='pBody'>
-	    <ul>
-	    	      <li id="n-mainpage"><a href="/caving/wiki/Main_Page">Main Page</a></li>
-	     	      <li id="n-Calendar"><a href="/caving/wiki/Calendar">Calendar</a></li>
-	     	      <li id="n-Socials"><a href="/caving/wiki/Socials">Socials</a></li>
-	     	      <li id="n-Costs"><a href="/caving/wiki/Costs">Costs</a></li>
-	     	      <li id="n-Gear"><a href="/caving/wiki/Gear">Gear</a></li>
-	     	      <li id="n-Safety"><a href="/caving/wiki/Safety">Safety</a></li>
-	     	      <li id="n-Library"><a href="/caving/wiki/Library">Library</a></li>
-	     	      <li id="n-Training"><a href="/caving/wiki/Training">Training</a></li>
-	     	      <li id="n-Photos"><a href="/caving/wiki/Photos">Photos</a></li>
-	     	      <li id="n-Email-lists"><a href="/caving/wiki/Email_lists">Email lists</a></li>
-	     	      <li id="n-Expo"><a href="/caving/wiki/Expo">Expo</a></li>
-	     	      <li id="n-Ardèche"><a href="/caving/wiki/Ard%C3%A8che">Ardèche</a></li>
-	     	      <li id="n-ExCS"><a href="/caving/wiki/Excs">ExCS</a></li>
-	     	      <li id="n-Archive"><a href="/caving/wiki/Archive">Archive</a></li>
-	     	      <li id="n-Contacts"><a href="/caving/wiki/Contacts">Contacts</a></li>
-	     	      <li id="n-Majorca-2009"><a href="/caving/wiki/Majorca_2009/">Majorca 2009</a></li>
-	     	      <li id="n-Expo-2008"><a href="/caving/wiki/Expo_2008/">Expo 2008</a></li>
-	     	      <li id="n-Expo-2009"><a href="/caving/wiki/Expo_2009/">Expo 2009</a></li>
-	     	    </ul>
-	  </div>
+
 	</div>
 		<div class="portlet" id="p-tb">
     	</div>
@@ -166,11 +110,11 @@ Retrieved from "<a href="http://camcaving.uk/Documents/Expo/Legacy/2008/Committe
 		<table width = "100%">
 			<tr><td width="5%" align="left" nowrap='nowrap'></td>
 				<td align="center">
-	    This page was last modified on 15 May 2008, at 12:58. - 	  This page has been accessed 183 times. - 	  	  	  	  <a href="/caving/wiki/CUCCWiki:General_disclaimer" title="CUCCWiki:General disclaimer">Disclaimers</a> - 	  <a href="/caving/wiki/CUCCWiki:About" title="CUCCWiki:About">About CUCCWiki</a>	</td>
-			<td width="5%" align="right" nowrap='nowrap'><div id="f-poweredbyico"><a href="http://www.mediawiki.org/"><img src="/caving/wiki/skins/common/images/poweredby_mediawiki_88x31.png" alt="Powered by MediaWiki" /></a></div></td></tr></table>
+	    This page was last modified on 15 May 2008, at 12:58. - 	  This page has been accessed 183 times. - 	  	  	  
+			</table>
       </div>
 	
-		<script type="text/javascript">if (window.runOnloadHook) runOnloadHook();</script>
+			<!-- hand edited to remove bad links 2019-12-11 by philip sargent -->
 </div>
 <!-- Served in 0.221 secs. -->  </body>
 </html>
diff --git a/years/2008/oversuitrepair.html b/years/2008/oversuitrepair.html
index 287b98b67..68b76fea9 100644
--- a/years/2008/oversuitrepair.html
+++ b/years/2008/oversuitrepair.html
@@ -6,8 +6,7 @@
 		<meta name="keywords" content="Oversuit repair,Aaron,Frank,Duncan.collis" />
 		<link rel="shortcut icon" href="/caving/favicon.ico" />
 		<link rel="search" type="application/opensearchdescription+xml" href="/caving/wiki/opensearch_desc.php" title="CUCCWiki (en)" />
-		<link rel="alternate" type="application/rss+xml" title="CUCCWiki RSS Feed" href="http://www.camcaving/caving/wiki/index.php?title=Special:RecentChanges&amp;feed=rss" />
-		<link rel="alternate" type="application/atom+xml" title="CUCCWiki Atom Feed" href="http://www.camcaving/caving/wiki/index.php?title=Special:RecentChanges&amp;feed=atom" />
+		
     <title>Oversuit repair - Cambridge University Caving Club</title>
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "/caving/wiki/skins/kindofblue/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="/caving/wiki/skins/common/commonPrint.css" />
@@ -17,36 +16,7 @@
     <!--[if IE]><script type="text/javascript" src="/caving/wiki/skins/common/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
     
-    <script type= "text/javascript">/*<![CDATA[*/
-var skin = "kindofblue";
-var stylepath = "/caving/wiki/skins";
-var wgArticlePath = "/caving/wiki/$1";
-var wgScriptPath = "/caving/wiki";
-var wgScript = "/caving/wiki/index.php";
-var wgVariantArticlePath = false;
-var wgActionPaths = [];
-var wgServer = "http://www.camcaving";
-var wgCanonicalNamespace = "";
-var wgCanonicalSpecialPageName = false;
-var wgNamespaceNumber = 0;
-var wgPageName = "Oversuit_repair";
-var wgTitle = "Oversuit repair";
-var wgAction = "view";
-var wgArticleId = "255";
-var wgIsArticle = true;
-var wgUserName = null;
-var wgUserGroups = null;
-var wgUserLanguage = "en";
-var wgContentLanguage = "en";
-var wgBreakFrames = false;
-var wgCurRevisionId = "1024";
-var wgVersion = "1.13.2";
-var wgEnableAPI = true;
-var wgEnableWriteAPI = false;
-var wgRestrictionEdit = [];
-var wgRestrictionMove = [];
-/*]]>*/</script>
-
+   
 		<script type="text/javascript" src="/caving/wiki/skins/common/wikibits.js?164"><!-- wikibits js --></script>
 		<script type="text/javascript" src="/caving/wiki/index.php?title=-&amp;action=raw&amp;gen=js&amp;useskin=kindofblue"><!-- site js --></script>
 		<style type="text/css">/*<![CDATA[*/
@@ -138,44 +108,16 @@ Expensive parser function count: 0/100
 
 <!-- Saved in parser cache with key cucaving:pcache:idhash:255-0!1!0!!en!2!edit=0 and timestamp 20090102004700 -->
 <div class="printfooter">
-Retrieved from "<a href="http://www.camcaving/caving/wiki/Oversuit_repair">http://www.camcaving/caving/wiki/Oversuit_repair</a>"</div>
+Retrieved from <U>http://www.srcf.cam.ac.uk/caving/wiki/Oversuit_repair</U>"</div>
 	    	    <!-- end content -->
 	    <div class="visualClear"></div>
 	  </div>
 	 </div>
     </div>
     <div id="column-one">
-	 <div class="portlet" id="p-logo">
-	  <a style="background-image: url(/caving/wiki/skins/common/images/wiki.png);"
-	    href="/caving/wiki/Main_Page"
-	    title="Main Page"></a>
-	 </div>
-	<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
+
 		<div class='portlet' id='p-navigation'>
-	  <h5>Navigation</h5>
-	  <div class='pBody'>
-	    <ul>
-	    	      <li id="n-mainpage"><a href="/caving/wiki/Main_Page">Main Page</a></li>
-	     	      <li id="n-Calendar"><a href="/caving/wiki/Calendar">Calendar</a></li>
-	     	      <li id="n-Socials"><a href="/caving/wiki/Socials">Socials</a></li>
-	     	      <li id="n-Costs"><a href="/caving/wiki/Costs">Costs</a></li>
-	     	      <li id="n-Gear"><a href="/caving/wiki/Gear">Gear</a></li>
-	     	      <li id="n-Safety"><a href="/caving/wiki/Safety">Safety</a></li>
-	     	      <li id="n-Library"><a href="/caving/wiki/Library">Library</a></li>
-	     	      <li id="n-Training"><a href="/caving/wiki/Training">Training</a></li>
-	     	      <li id="n-Photos"><a href="/caving/wiki/Photos">Photos</a></li>
-	     	      <li id="n-Email-lists"><a href="/caving/wiki/Email_lists">Email lists</a></li>
-	     	      <li id="n-Expo"><a href="/caving/wiki/Expo">Expo</a></li>
-	     	      <li id="n-Ardèche"><a href="/caving/wiki/Ard%C3%A8che">Ardèche</a></li>
-	     	      <li id="n-ExCS"><a href="/caving/wiki/Excs">ExCS</a></li>
-	     	      <li id="n-Archive"><a href="/caving/wiki/Archive">Archive</a></li>
-	     	      <li id="n-Contacts"><a href="/caving/wiki/Contacts">Contacts</a></li>
-	     	      <li id="n-Majorca-2009"><a href="/caving/wiki/Majorca_2009/">Majorca 2009</a></li>
-	     	      <li id="n-Expo-2008"><a href="/caving/wiki/Expo_2008/">Expo 2008</a></li>
-	     	      <li id="n-Expo-2009"><a href="/caving/wiki/Expo_2009/">Expo 2009</a></li>
-	     	    </ul>
-	  </div>
-	</div>
+
 		<div class="portlet" id="p-tb">
     	</div>
 	      </div><!-- end of the left (by default at least) column -->
@@ -184,11 +126,10 @@ Retrieved from "<a href="http://www.camcaving/caving/wiki/Oversuit_repair">http:
 		<table width = "100%">
 			<tr><td width="5%" align="left" nowrap='nowrap'></td>
 				<td align="center">
-	    This page was last modified on 2 June 2008, at 18:27. - 	  This page has been accessed 142 times. - 	  	  	  	  <a href="/caving/wiki/CUCCWiki:General_disclaimer" title="CUCCWiki:General disclaimer">Disclaimers</a> - 	  <a href="/caving/wiki/CUCCWiki:About" title="CUCCWiki:About">About CUCCWiki</a>	</td>
-			<td width="5%" align="right" nowrap='nowrap'><div id="f-poweredbyico"><a href="http://www.mediawiki.org/"><img src="/caving/wiki/skins/common/images/poweredby_mediawiki_88x31.png" alt="Powered by MediaWiki" /></a></div></td></tr></table>
+	    This page was last modified on 2 June 2008, at 18:27. - 	  This page has been accessed 142 times. - 	  	  	  	 </table>
       </div>
 	
-		<script type="text/javascript">if (window.runOnloadHook) runOnloadHook();</script>
+	<!-- hand edited to remove bad links 2019-12-11 by philip sargent -->
 </div>
 <!-- Served in 0.230 secs. -->  </body>
 </html>
diff --git a/years/2016/index.html b/years/2016/index.html
index fcc8a63e2..b0bdb065f 100644
--- a/years/2016/index.html
+++ b/years/2016/index.html
@@ -7,7 +7,7 @@
 <h1>Expo 2016: documentation index</h1>
 <p><span style="font-weight: bold;">Pre-Expo Documentation</span></p>
 <ul>
-<li><a href="http://camcaving.uk/Documents/Expo/Legacy/2016/Who_and_When">Who and when planning page</a></li>
+<li><a href="https://camcaving.uk/Documents/Expo/Legacy/2016/">Who and when planning page</a></li>
 <li><a href="../2015/stuffleftattopcamp.html">Things left at top camp 2015</a></li>
 <li><a href="stuffbought.html">Things bought 2016</a></li>
 <li><a href="sponsors.html">Sponsors 2016 </a></li>
diff --git a/years/2018/index.html b/years/2018/index.html
index 2dd5f515f..7873ddefd 100644
--- a/years/2018/index.html
+++ b/years/2018/index.html
@@ -10,9 +10,8 @@
 Link to last year: <a href="../2017/">2017</a>
 <h3>Pre-Expo Planning</h3>
 <ul>
-<li><a href="https://camcaving.uk/Documents/Expo/Legacy/2018#Pre-Expedition_Tasks">Task tracking expo 2018</a></li>
-<li><a href="https://camcaving.uk/Documents/Expo/Legacy/2018/Who_and_When">Who and when planning page</a></li>
-<li><a href="http://www.camcaving/caving/wiki/Website_to-do">To do list expo 2018</a></li>
+<li><a href="https://camcaving.uk/Documents/Expo/Legacy/2018/">Task tracking expo 2018</a></li>
+<li><a href="https://camcaving.uk/Documents/Expo/Legacy/2018/">Who and when planning page</a></li>
 <li><a href="https://github.com/CaveSurveyGIS/CUCCexposurveyissues/issues">Survey notes to do (GitHub)</a></li>
 <li><a href="../2017/topcamplist.html">Things left at top camp 2017</a></li>
 <!--<li><a href="../2017/stuffleftatbasecamp.html">Stuff left at base camp 2017</a></li>-->
diff --git a/years/2019/index.html b/years/2019/index.html
index 7632dc9d7..d29f6aeb4 100644
--- a/years/2019/index.html
+++ b/years/2019/index.html
@@ -13,13 +13,12 @@ Link to last year: <a href="../2018/index.html">2018</a>
 <h3>Every Expo - ongoing jobs</h3>
 <ul>
 <li><a href="https://github.com/CaveSurveyGIS/CUCCexposurveyissues/issues">Github: Survey notes to do</a></li>
-<li><a href="http://www.camcaving/caving/wiki/Website_to-do">Expo website updating</a>(old list, revise/delete?)</li>
+<li><a href="http://www.camcaving.uk/caving/wiki/Website_to-do">Expo website updating</a>(old list, revise/delete?)</li>
 </ul>
 
 <h3>Pre-Expo Planning</h3>
 Using camcaving (or other wiki-type software):
 <ul>
-<li><a href="https://camcaving.uk/Documents/Expo/Legacy/2019#Pre-Expedition_Tasks">Task tracking expo 2019</a></li>
 <li><a href="https://docs.google.com/spreadsheets/d/1iNzJySh0qTvWmgPN47jTJcuYv73JgKOCsPZwLNKz1XI/edit?usp=sharing">Who and when planning page</a></li>
 </ul>
 On expo website: