From c5f150244f86a9fdafc852c02b6364afd9e2be92 Mon Sep 17 00:00:00 2001
From: "Philip Sargent  (muscogee)" <philip.sargent@gmail.com>
Date: Wed, 11 Dec 2019 00:42:11 +0000
Subject: [PATCH] removing large chunks and  bad links in the included files
 from srcf

---
 years/2016/Expo 2016_Who and When.html | 231 ++-----------------------
 years/2018/Expo 2018_Who and When.html | 219 +----------------------
 2 files changed, 20 insertions(+), 430 deletions(-)
diff --git a/years/2016/Expo 2016_Who and When.html b/years/2016/Expo 2016_Who and When.html
index a1dc6c911..a2622da42 100644
--- a/years/2016/Expo 2016_Who and When.html	
+++ b/years/2016/Expo 2016_Who and When.html	
@@ -1,101 +1,15 @@
 <!DOCTYPE html>
 <!-- saved from url=(0125)https://camcaving.uk/Documents/Expo/Legacy/2016/Expo%202016_Who%20and%20When%20-%20Cambridge%20University%20Caving%20Club.htm -->
-<html class="client-js" dir="ltr" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<html class="client-js" dir="ltr" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 
 <title>Expo 2016/Who and When - Cambridge University Caving Club</title>
-<script>document.documentElement.className = document.documentElement.className.replace( /(^|\s)client-nojs(\s|$)/, "$1client-js$2" );</script>
-<script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgCanonicalNamespace":"","wgCanonicalSpecialPageName":false,"wgNamespaceNumber":0,"wgPageName":"Expo_2016/Who_and_When","wgTitle":"Expo 2016/Who and When","wgCurRevisionId":4517,"wgRevisionId":4517,"wgArticleId":782,"wgIsArticle":true,"wgIsRedirect":false,"wgAction":"view","wgUserName":null,"wgUserGroups":["*"],"wgCategories":[],"wgBreakFrames":false,"wgPageContentLanguage":"en","wgPageContentModel":"wikitext","wgSeparatorTransformTable":["",""],"wgDigitTransformTable":["",""],"wgDefaultDateFormat":"dmy","wgMonthNames":["","January","February","March","April","May","June","July","August","September","October","November","December"],"wgMonthNamesShort":["","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"wgRelevantPageName":"Expo_2016/Who_and_When","wgRelevantArticleId":782,"wgRequestId":"XVKStoNvs2MAAV-RREcAAACy","wgIsProbablyEditable":false,"wgRestrictionEdit":[],"wgRestrictionMove":[]});mw.loader.state({"site.styles":"ready","noscript":"ready","user.styles":"ready","user.cssprefs":"ready","user":"ready","user.options":"loading","user.tokens":"loading","mediawiki.legacy.shared":"ready","mediawiki.legacy.commonPrint":"ready","mediawiki.sectionAnchor":"ready","skins.modern":"ready"});mw.loader.implement("user.options@0j3lz3q",function($,jQuery,require,module){mw.user.options.set({"variant":"en"});});mw.loader.implement("user.tokens@0g7wwyk",function ( $, jQuery, require, module ) {
-mw.user.tokens.set({"editToken":"+\\","patrolToken":"+\\","watchToken":"+\\","csrfToken":"+\\"});/*@nomin*/;
 
-});mw.loader.load(["mediawiki.page.startup"]);});</script>
-<link rel="stylesheet" href="./Expo 2016_Who and When_files/load.css">
-<script async="" src="./Expo 2016_Who and When_files/load_002.php"></script>
-<style>
-.mw-collapsible-toggle{float:right;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}  .mw-content-ltr .mw-collapsible-toggle,.mw-content-rtl .mw-content-ltr .mw-collapsible-toggle{float:right} .mw-content-rtl .mw-collapsible-toggle,.mw-content-ltr .mw-content-rtl .mw-collapsible-toggle{float:left}.mw-customtoggle,.mw-collapsible-toggle{cursor:pointer} caption .mw-collapsible-toggle,.mw-content-ltr caption .mw-collapsible-toggle,.mw-content-rtl caption .mw-collapsible-toggle,.mw-content-rtl .mw-content-ltr caption .mw-collapsible-toggle,.mw-content-ltr .mw-content-rtl caption .mw-collapsible-toggle{float:none} li .mw-collapsible-toggle,.mw-content-ltr li .mw-collapsible-toggle,.mw-content-rtl li .mw-collapsible-toggle,.mw-content-rtl .mw-content-ltr li .mw-collapsible-toggle,.mw-content-ltr .mw-content-rtl li .mw-collapsible-toggle{float:none} .mw-collapsible-toggle-li{list-style:none}
-.suggestions{overflow:hidden;position:absolute;top:0;left:0;width:0;border:none;z-index:1099;padding:0;margin:-1px 0 0 0}.suggestions-special{position:relative;background-color:#fff;cursor:pointer;border:solid 1px #aaa;padding:0;margin:0;margin-top:-2px;display:none;padding:0.25em 0.25em;line-height:1.25em}.suggestions-results{background-color:#fff;cursor:pointer;border:solid 1px #aaa;padding:0;margin:0}.suggestions-result{color:#000;margin:0;line-height:1.5em;padding:0.01em 0.25em;text-align:left; overflow:hidden;-o-text-overflow:ellipsis; text-overflow:ellipsis;white-space:nowrap}.suggestions-result-current{background-color:#4c59a6;color:#fff}.suggestions-special .special-label{color:#808080;text-align:left}.suggestions-special .special-query{color:#000;font-style:italic;text-align:left}.suggestions-special .special-hover{background-color:#c0c0c0}.suggestions-result-current .special-label,.suggestions-result-current .special-query{color:#fff}.highlight{font-weight:bold}
-.postedit-container{margin:0 auto;position:fixed;top:0;height:0;left:50%;z-index:1000;font-size:13px}.postedit-container:hover{cursor:pointer}.postedit{position:relative;top:0.6em;left:-50%;padding:.6em 3.6em .6em 1.1em;line-height:1.5625em;color:#626465;background-color:#f4f4f4;border:1px solid #dcd9d9;text-shadow:0 0.0625em 0 rgba( 255,255,255,0.5 );border-radius:5px;box-shadow:0 2px 5px 0 #ccc;-webkit-transition:all 0.25s ease-in-out;-moz-transition:all 0.25s ease-in-out;-ms-transition:all 0.25s ease-in-out;-o-transition:all 0.25s ease-in-out;transition:all 0.25s ease-in-out}.skin-monobook .postedit{top:6em !important}.postedit-faded{opacity:0}.postedit-icon{padding-left:41px;  line-height:25px;background-repeat:no-repeat;background-position:8px 50%}.postedit-icon-checkmark{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB9ElEQVR4AZWRA3AYURQArxrVHtW2bdu2bdu2zdi2bdu2bWxs7zeehZaw4f70kbs+zI3e/nWK+RWx3aOFlrL56Sy5SxrruG69hlv6OyK+mz+8KDSXdXembj0ispT7tjs4ZTIbpYBvxGSGKzZTeFrb7W/meN002swFs0U8ttpHTkF2BvCqWQrW35929bTsKm5Zb+SEwWwcY8wAngB9m7Z+d+rIPZ/npdy12M5p47n8dXsCYAf0qPy06eGMdktuDu9Qf+JmKl3SWM91qzVcN9tAbEYkwMaq0tyb1m/To5kP170el/BK8/qa6sJr70ydf+T/Uu5ab+Oo/lS0AkUBpIFWlZ9WPhxpse/PHO7YbOOczjL0vZV2lNxPPtG73dYXM+xvm2znrOl83tidoqCwMBgYXsPFB0on5S6pr+eK5TKuW67lgvaKvF8mL1dtfTL32FHxRdyx3cQpg7m4x9sCXKkTIzA4LDH44zWdzaUf71hv5rTG4uyzcusybxSX7aThbMQ8XgCYAp3rzTTQOiIh9PNlzY3FSuZxrzjme1Y7uGS6kjsWO4jPjM4FVjRZsvD4kO9XtTZzQn82NyzWc0B7AmZh6gA/hOYSGhfw9YbOVnarj+S7800AL2BIsxUAbWNToj7bhBuQmZcOsFdoKUC74rGheCwXmqAIQTc9jQcrADIAAAAASUVORK5CYII=);background-image:url(/wiki/resources/src/mediawiki.action/images/green-checkmark.png?d94f1)!ie;background-position:left}.postedit-close{position:absolute;padding:0 .8em;right:0;top:0;font-size:1.25em;font-weight:bold;line-height:2.3em;color:#000;text-shadow:0 0.0625em 0 #fff;text-decoration:none;opacity:0.2;filter:alpha( opacity=20 )}.postedit-close:hover{color:#000;text-decoration:none;opacity:0.4;filter:alpha( opacity=40 )}</style><style>
-.suggestions a.mw-searchSuggest-link,.suggestions a.mw-searchSuggest-link:hover,.suggestions a.mw-searchSuggest-link:active,.suggestions a.mw-searchSuggest-link:focus{color:#000;text-decoration:none}.suggestions-result-current a.mw-searchSuggest-link,.suggestions-result-current a.mw-searchSuggest-link:hover,.suggestions-result-current a.mw-searchSuggest-link:active,.suggestions-result-current a.mw-searchSuggest-link:focus{color:#fff}.suggestions a.mw-searchSuggest-link .special-query{ overflow:hidden;-o-text-overflow:ellipsis; text-overflow:ellipsis;white-space:nowrap}</style><meta name="ResourceLoaderDynamicStyles" content="">
 <meta name="generator" content="MediaWiki 1.28.2">
-<link rel="shortcut icon" href="http://caving.soc.srcf.net/favicon.ico">
-<link rel="search" type="application/opensearchdescription+xml" href="http://caving.soc.srcf.net/wiki/opensearch_desc.php" title="Cambridge University Caving Club - CUCC wiki (en)">
-<link rel="EditURI" type="application/rsd+xml" href="http://caving.soc.srcf.net/wiki/api.php?action=rsd">
-<link rel="alternate" type="application/atom+xml" title="Cambridge University Caving Club - CUCC wiki Atom feed" href="http://caving.soc.srcf.net/wiki/index.php?title=Special:RecentChanges&amp;feed=atom">
-<script src="./Expo 2016_Who and When_files/load.php"></script><script src="./Expo 2016_Who and When_files/load(1).php"></script><script type="text/javascript">// Promises 
-var _eid_promises = {}; 
-// Turn the incoming message from extension 
-// into pending Promise resolving 
-window.addEventListener("message", function(event) { 
-    if(event.source !== window) return; 
-    if(event.data.src && (event.data.src === "background.js")) { 
-        console.log("Page received: "); 
-        console.log(event.data); 
-        // Get the promise 
-        if(event.data.nonce) { 
-            var p = _eid_promises[event.data.nonce]; 
-            // resolve 
-            if(event.data.result === "ok") { 
-                if(event.data.signature !== undefined) { 
-                    p.resolve({hex: event.data.signature}); 
-                } else if(event.data.version !== undefined) { 
-                    p.resolve(event.data.extension + "/" + event.data.version); 
-                } else if(event.data.cert !== undefined) { 
-                    p.resolve({hex: event.data.cert}); 
-                } else { 
-                    console.log("No idea how to handle message"); 
-                    console.log(event.data); 
-                } 
-            } else { 
-                // reject 
-                p.reject(new Error(event.data.result)); 
-            } 
-            delete _eid_promises[event.data.nonce]; 
-        } else { 
-            console.log("No nonce in event msg"); 
-        } 
-    } 
-}, false); 
- 
- 
-function TokenSigning() { 
-    function nonce() { 
-        var val = ""; 
-        var hex = "abcdefghijklmnopqrstuvwxyz0123456789"; 
-        for(var i = 0; i < 16; i++) val += hex.charAt(Math.floor(Math.random() * hex.length)); 
-        return val; 
-    } 
- 
-    function messagePromise(msg) { 
-        return new Promise(function(resolve, reject) { 
-            // amend with necessary metadata 
-            msg["nonce"] = nonce(); 
-            msg["src"] = "page.js"; 
-            // send message 
-            window.postMessage(msg, "*"); 
-            // and store promise callbacks 
-            _eid_promises[msg.nonce] = { 
-                resolve: resolve, 
-                reject: reject 
-            }; 
-        }); 
-    } 
-    this.getCertificate = function(options) { 
-        var msg = {type: "CERT", lang: options.lang, filter: options.filter}; 
-        console.log("getCertificate()"); 
-        return messagePromise(msg); 
-    }; 
-    this.sign = function(cert, hash, options) { 
-        var msg = {type: "SIGN", cert: cert.hex, hash: hash.hex, hashtype: hash.type, lang: options.lang, info: options.info}; 
-        console.log("sign()"); 
-        return messagePromise(msg); 
-    }; 
-    this.getVersion = function() { 
-        console.log("getVersion()"); 
-        return messagePromise({ 
-            type: "VERSION" 
-        }); 
-    }; 
-}</script></head>
+
+</head>
 <body class="mediawiki ltr sitedir-ltr mw-hide-empty-elt ns-0 ns-subject page-Expo_2016_Who_and_When rootpage-Expo_2016_Who_and_When skin-modern action-view">
 		<!-- heading -->
 		<div id="mw_header">
@@ -105,21 +19,7 @@ function TokenSigning() {
 		</div>
 
 		<div id="mw_main">
-			<div id="mw_contentwrapper">
-				<!-- navigation portlet -->
-						<div id="p-cactions" class="portlet" role="navigation">
-			<h3>Views</h3>
 
-			<div class="pBody">
-				<ul>
-				<li id="ca-nstab-main" class="selected"><a href="http://caving.soc.srcf.net/wiki/Expo_2016/Who_and_When" title="View the content page [Alt+Shift+c]" accesskey="c">Page</a></li>
-				<li id="ca-talk" class="new"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Talk:Expo_2016/Who_and_When&amp;action=edit&amp;redlink=1" rel="discussion" title="Discussion about the content page [Alt+Shift+t]" accesskey="t">Discussion</a></li>
-				<li id="ca-viewsource"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;action=edit" title="This page is protected.
-You can view its source [Alt+Shift+e]" accesskey="e">View source</a></li>
-				<li id="ca-history"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;action=history" title="Past revisions of this page [Alt+Shift+h]" accesskey="h">History</a></li>
-				</ul>
-							</div>
-		</div>
 	
 				<!-- content -->
 				<div id="mw_content" role="main">
@@ -132,10 +32,7 @@ You can view its source [Alt+Shift+e]" accesskey="e">View source</a></li>
 							<div class="mw-topbox" id="siteSub">From Cambridge University Caving Club - CUCC wiki</div>
 																				</div>
 
-						<div id="contentSub"></div>
-
-												<div id="jump-to-nav">Jump to:							<a href="https://camcaving.uk/Documents/Expo/Legacy/2016/Expo%202016_Who%20and%20When%20-%20Cambridge%20University%20Caving%20Club.htm#mw_portlets">navigation</a>, 							<a href="https://camcaving.uk/Documents/Expo/Legacy/2016/Expo%202016_Who%20and%20When%20-%20Cambridge%20University%20Caving%20Club.htm#searchInput">search</a>
-						</div>
+						
 
 						<div id="mw-content-text" dir="ltr" class="mw-content-ltr" lang="en"><h2><span class="mw-headline" id="Who_and_When">Who and When</span></h2>
 <ul><li>The table below is a visual guide to the number of people that will be on Expo during each week. </li></ul>
@@ -1409,121 +1306,19 @@ Transclusion expansion time report (%,ms,calls,template)
 <!-- Saved in parser cache with key cucaving:pcache:idhash:782-0!*!*!!*!*!* and timestamp 20190812233414 and revision id 4517
  -->
 </div><div class="printfooter">
-Retrieved from "<a dir="ltr" href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;oldid=4517">http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;oldid=4517</a>"</div>
-						<div class="mw_clear"></div>
-						<div id="catlinks" class="catlinks catlinks-allhidden" data-mw="interface"></div>											</div><!-- mw_contentholder -->
-				</div><!-- mw_content -->
-			</div><!-- mw_contentwrapper -->
+Retrieved from "<u>>http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;oldid=4517</u>"</div>
+						
 
-			<div id="mw_portlets">
-				<h2>Navigation menu</h2>
-
-				<!-- portlets -->
-					<div class="generated-sidebar portlet" id="p-navigation" role="navigation">
-		<h3>Navigation</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Cambridge-University-Caving-Club"><a href="http://caving.soc.srcf.net/wiki/Main_Page">Cambridge University Caving Club</a></li>
-									</ul>
-					</div>
-		</div>
-		<div class="generated-sidebar portlet" id="p-Fresher_section" role="navigation">
-		<h3>Fresher section</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Calendar"><a href="http://caving.soc.srcf.net/wiki/Calendar">Calendar</a></li>
-											<li id="n-How-to-join"><a href="http://caving.soc.srcf.net/wiki/Important_information_for_caving">How to join</a></li>
-											<li id="n-Email-lists"><a href="http://caving.soc.srcf.net/wiki/Email_lists">Email lists</a></li>
-											<li id="n-Costs"><a href="http://caving.soc.srcf.net/wiki/Costs">Costs</a></li>
-											<li id="n-Gear"><a href="http://caving.soc.srcf.net/wiki/Gear">Gear</a></li>
-											<li id="n-Training"><a href="http://caving.soc.srcf.net/wiki/Training">Training</a></li>
-											<li id="n-Safety"><a href="http://caving.soc.srcf.net/wiki/Safety">Safety</a></li>
-									</ul>
-					</div>
-		</div>
-		<div class="generated-sidebar portlet" id="p-Knowledge" role="navigation">
-		<h3>Knowledge</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Trips-in-UK"><a href="http://caving.soc.srcf.net/wiki/Past_Meets">Trips in UK</a></li>
-											<li id="n-Trips-outside-UK"><a href="http://caving.soc.srcf.net/wiki/Outside_UK">Trips outside UK</a></li>
-											<li id="n-The-Expo"><a href="http://caving.soc.srcf.net/wiki/Expo">The Expo</a></li>
-											<li id="n-Library"><a href="http://caving.soc.srcf.net/wiki/Library">Library</a></li>
-											<li id="n-Photos"><a href="http://caving.soc.srcf.net/wiki/Photos">Photos</a></li>
-									</ul>
-					</div>
-		</div>
-		<div class="generated-sidebar portlet" id="p-Contacts" role="navigation">
-		<h3>Contacts</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Committee"><a href="http://caving.soc.srcf.net/wiki/Contacts">Committee</a></li>
-											<li id="n-Caver-alumnus.3F"><a href="http://caving.soc.srcf.net/wiki/Excs">Caver alumnus?</a></li>
-									</ul>
-					</div>
-		</div>
-			<div id="p-search" class="portlet" role="search">
-			<h3><label for="searchInput">Search</label></h3>
-
-			<div id="searchBody" class="pBody">
-				<form action="https://camcaving.uk/wiki/index.php" id="searchform">
-					<input type="hidden" name="title" value="Special:Search">
-					<input type="search" name="search" placeholder="Search Cambridge University Caving Club - CUCC wiki" title="Search Cambridge University Caving Club - CUCC wiki [Alt+Shift+f]" accesskey="f" id="searchInput" autocomplete="off">
-					<input type="submit" name="go" value="Go" title="Go to a page with this exact name if it exists" id="searchGoButton" class="searchButton">&nbsp;
-						<input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton">
-				</form>
-
-							</div>
-		</div>
-			<div class="portlet" id="p-tb" role="navigation">
-			<h3>Tools</h3>
-
-			<div class="pBody">
-				<ul>
-											<li id="t-whatlinkshere"><a href="http://caving.soc.srcf.net/wiki/Special:WhatLinksHere/Expo_2016/Who_and_When" title="A list of all wiki pages that link here [Alt+Shift+j]" accesskey="j">What links here</a></li>
-											<li id="t-recentchangeslinked"><a href="http://caving.soc.srcf.net/wiki/Special:RecentChangesLinked/Expo_2016/Who_and_When" rel="nofollow" title="Recent changes in pages linked from this page [Alt+Shift+k]" accesskey="k">Related changes</a></li>
-											<li id="t-specialpages"><a href="http://caving.soc.srcf.net/wiki/Special:SpecialPages" title="A list of all special pages [Alt+Shift+q]" accesskey="q">Special pages</a></li>
-											<li id="t-print"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;printable=yes" rel="alternate" title="Printable version of this page [Alt+Shift+p]" accesskey="p">Printable version</a></li>
-											<li id="t-permalink"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;oldid=4517" title="Permanent link to this revision of the page">Permanent link</a></li>
-											<li id="t-info"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2016/Who_and_When&amp;action=info" title="More information about this page">Page information</a></li>
-									</ul>
-							</div>
+		
 		</div>
 	
-			</div><!-- mw_portlets -->
-
-
+			
+		
 		</div><!-- main -->
 
-		<div class="mw_clear"></div>
-
-		<!-- personal portlet -->
-		<div class="portlet" id="p-personal" role="navigation">
-			<h3>Personal tools</h3>
-
-			<div class="pBody">
-				<ul>
-											<li id="pt-createaccount"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Special:CreateAccount&amp;returnto=Expo+2016%2FWho+and+When" title="You are encouraged to create an account and log in; however, it is not mandatory">Create account</a></li>
-											<li id="pt-login"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Special:UserLogin&amp;returnto=Expo+2016%2FWho+and+When" title="You are encouraged to log in; however, it is not mandatory [Alt+Shift+o]" accesskey="o">Log in</a></li>
-									</ul>
-			</div>
-		</div>
+		
 
 
 		<!-- footer -->
-		<div id="footer" role="contentinfo">
-			<ul id="f-list">
-										<li id="lastmod"> This page was last modified on 13 January 2017, at 13:46.</li>
-											<li id="privacy"><a href="http://caving.soc.srcf.net/wiki/Cambridge_University_Caving_Club_-_CUCC_wiki:Privacy_policy" title="Cambridge University Caving Club - CUCC wiki:Privacy policy">Privacy policy</a></li>
-											<li id="about"><a href="http://caving.soc.srcf.net/wiki/Cambridge_University_Caving_Club_-_CUCC_wiki:About" title="Cambridge University Caving Club - CUCC wiki:About">About Cambridge University Caving Club - CUCC wiki</a></li>
-											<li id="disclaimer"><a href="http://caving.soc.srcf.net/wiki/Cambridge_University_Caving_Club_-_CUCC_wiki:General_disclaimer" title="Cambridge University Caving Club - CUCC wiki:General disclaimer">Disclaimers</a></li>
-								</ul>
-							<div id="mw_poweredby">
-											<a href="http://www.mediawiki.org/">Powered by MediaWiki</a>
-									</div>
-					</div>
-
-		<script>(window.RLQ=window.RLQ||[]).push(function(){mw.loader.load(["mediawiki.action.view.postEdit","site","mediawiki.user","mediawiki.hidpi","mediawiki.page.ready","mediawiki.searchSuggest"]);});</script><script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgBackendResponseTime":603});});</script>
-	
-
+		
 		<div style="display: none; font-size: 13.3333px;" class="suggestions"><div class="suggestions-results"></div><div class="suggestions-special"></div></div></body></html>
\ No newline at end of file
diff --git a/years/2018/Expo 2018_Who and When.html b/years/2018/Expo 2018_Who and When.html
index 693201c0c..36828685c 100644
--- a/years/2018/Expo 2018_Who and When.html	
+++ b/years/2018/Expo 2018_Who and When.html	
@@ -1,101 +1,16 @@
 <!DOCTYPE html>
 <!-- saved from url=(0125)https://camcaving.uk/Documents/Expo/Legacy/2018/Expo%202018_Who%20and%20When%20-%20Cambridge%20University%20Caving%20Club.htm -->
-<html class="client-js" dir="ltr" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<html>
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 
 <title>Expo 2018/Who and When - Cambridge University Caving Club</title>
-<script>document.documentElement.className = document.documentElement.className.replace( /(^|\s)client-nojs(\s|$)/, "$1client-js$2" );</script>
-<script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgCanonicalNamespace":"","wgCanonicalSpecialPageName":false,"wgNamespaceNumber":0,"wgPageName":"Expo_2018/Who_and_When","wgTitle":"Expo 2018/Who and When","wgCurRevisionId":4949,"wgRevisionId":4949,"wgArticleId":793,"wgIsArticle":true,"wgIsRedirect":false,"wgAction":"view","wgUserName":null,"wgUserGroups":["*"],"wgCategories":[],"wgBreakFrames":false,"wgPageContentLanguage":"en","wgPageContentModel":"wikitext","wgSeparatorTransformTable":["",""],"wgDigitTransformTable":["",""],"wgDefaultDateFormat":"dmy","wgMonthNames":["","January","February","March","April","May","June","July","August","September","October","November","December"],"wgMonthNamesShort":["","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"wgRelevantPageName":"Expo_2018/Who_and_When","wgRelevantArticleId":793,"wgRequestId":"XVKS0INvs2MAACTOzAoAAABK","wgIsProbablyEditable":false,"wgRestrictionEdit":[],"wgRestrictionMove":[]});mw.loader.state({"site.styles":"ready","noscript":"ready","user.styles":"ready","user.cssprefs":"ready","user":"ready","user.options":"loading","user.tokens":"loading","mediawiki.legacy.shared":"ready","mediawiki.legacy.commonPrint":"ready","mediawiki.sectionAnchor":"ready","skins.modern":"ready"});mw.loader.implement("user.options@0j3lz3q",function($,jQuery,require,module){mw.user.options.set({"variant":"en"});});mw.loader.implement("user.tokens@0g7wwyk",function ( $, jQuery, require, module ) {
-mw.user.tokens.set({"editToken":"+\\","patrolToken":"+\\","watchToken":"+\\","csrfToken":"+\\"});/*@nomin*/;
 
-});mw.loader.load(["mediawiki.page.startup"]);});</script>
 <link rel="stylesheet" href="./Expo 2018_Who and When_files/load.css">
-<script async="" src="./Expo 2018_Who and When_files/load_002.php"></script>
-<style>
-.mw-collapsible-toggle{float:right;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}  .mw-content-ltr .mw-collapsible-toggle,.mw-content-rtl .mw-content-ltr .mw-collapsible-toggle{float:right} .mw-content-rtl .mw-collapsible-toggle,.mw-content-ltr .mw-content-rtl .mw-collapsible-toggle{float:left}.mw-customtoggle,.mw-collapsible-toggle{cursor:pointer} caption .mw-collapsible-toggle,.mw-content-ltr caption .mw-collapsible-toggle,.mw-content-rtl caption .mw-collapsible-toggle,.mw-content-rtl .mw-content-ltr caption .mw-collapsible-toggle,.mw-content-ltr .mw-content-rtl caption .mw-collapsible-toggle{float:none} li .mw-collapsible-toggle,.mw-content-ltr li .mw-collapsible-toggle,.mw-content-rtl li .mw-collapsible-toggle,.mw-content-rtl .mw-content-ltr li .mw-collapsible-toggle,.mw-content-ltr .mw-content-rtl li .mw-collapsible-toggle{float:none} .mw-collapsible-toggle-li{list-style:none}
-.suggestions{overflow:hidden;position:absolute;top:0;left:0;width:0;border:none;z-index:1099;padding:0;margin:-1px 0 0 0}.suggestions-special{position:relative;background-color:#fff;cursor:pointer;border:solid 1px #aaa;padding:0;margin:0;margin-top:-2px;display:none;padding:0.25em 0.25em;line-height:1.25em}.suggestions-results{background-color:#fff;cursor:pointer;border:solid 1px #aaa;padding:0;margin:0}.suggestions-result{color:#000;margin:0;line-height:1.5em;padding:0.01em 0.25em;text-align:left; overflow:hidden;-o-text-overflow:ellipsis; text-overflow:ellipsis;white-space:nowrap}.suggestions-result-current{background-color:#4c59a6;color:#fff}.suggestions-special .special-label{color:#808080;text-align:left}.suggestions-special .special-query{color:#000;font-style:italic;text-align:left}.suggestions-special .special-hover{background-color:#c0c0c0}.suggestions-result-current .special-label,.suggestions-result-current .special-query{color:#fff}.highlight{font-weight:bold}
-.postedit-container{margin:0 auto;position:fixed;top:0;height:0;left:50%;z-index:1000;font-size:13px}.postedit-container:hover{cursor:pointer}.postedit{position:relative;top:0.6em;left:-50%;padding:.6em 3.6em .6em 1.1em;line-height:1.5625em;color:#626465;background-color:#f4f4f4;border:1px solid #dcd9d9;text-shadow:0 0.0625em 0 rgba( 255,255,255,0.5 );border-radius:5px;box-shadow:0 2px 5px 0 #ccc;-webkit-transition:all 0.25s ease-in-out;-moz-transition:all 0.25s ease-in-out;-ms-transition:all 0.25s ease-in-out;-o-transition:all 0.25s ease-in-out;transition:all 0.25s ease-in-out}.skin-monobook .postedit{top:6em !important}.postedit-faded{opacity:0}.postedit-icon{padding-left:41px;  line-height:25px;background-repeat:no-repeat;background-position:8px 50%}.postedit-icon-checkmark{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB9ElEQVR4AZWRA3AYURQArxrVHtW2bdu2bdu2zdi2bdu2bWxs7zeehZaw4f70kbs+zI3e/nWK+RWx3aOFlrL56Sy5SxrruG69hlv6OyK+mz+8KDSXdXembj0ispT7tjs4ZTIbpYBvxGSGKzZTeFrb7W/meN002swFs0U8ttpHTkF2BvCqWQrW35929bTsKm5Zb+SEwWwcY8wAngB9m7Z+d+rIPZ/npdy12M5p47n8dXsCYAf0qPy06eGMdktuDu9Qf+JmKl3SWM91qzVcN9tAbEYkwMaq0tyb1m/To5kP170el/BK8/qa6sJr70ydf+T/Uu5ab+Oo/lS0AkUBpIFWlZ9WPhxpse/PHO7YbOOczjL0vZV2lNxPPtG73dYXM+xvm2znrOl83tidoqCwMBgYXsPFB0on5S6pr+eK5TKuW67lgvaKvF8mL1dtfTL32FHxRdyx3cQpg7m4x9sCXKkTIzA4LDH44zWdzaUf71hv5rTG4uyzcusybxSX7aThbMQ8XgCYAp3rzTTQOiIh9PNlzY3FSuZxrzjme1Y7uGS6kjsWO4jPjM4FVjRZsvD4kO9XtTZzQn82NyzWc0B7AmZh6gA/hOYSGhfw9YbOVnarj+S7800AL2BIsxUAbWNToj7bhBuQmZcOsFdoKUC74rGheCwXmqAIQTc9jQcrADIAAAAASUVORK5CYII=);background-image:url(/wiki/resources/src/mediawiki.action/images/green-checkmark.png?d94f1)!ie;background-position:left}.postedit-close{position:absolute;padding:0 .8em;right:0;top:0;font-size:1.25em;font-weight:bold;line-height:2.3em;color:#000;text-shadow:0 0.0625em 0 #fff;text-decoration:none;opacity:0.2;filter:alpha( opacity=20 )}.postedit-close:hover{color:#000;text-decoration:none;opacity:0.4;filter:alpha( opacity=40 )}</style><style>
-.suggestions a.mw-searchSuggest-link,.suggestions a.mw-searchSuggest-link:hover,.suggestions a.mw-searchSuggest-link:active,.suggestions a.mw-searchSuggest-link:focus{color:#000;text-decoration:none}.suggestions-result-current a.mw-searchSuggest-link,.suggestions-result-current a.mw-searchSuggest-link:hover,.suggestions-result-current a.mw-searchSuggest-link:active,.suggestions-result-current a.mw-searchSuggest-link:focus{color:#fff}.suggestions a.mw-searchSuggest-link .special-query{ overflow:hidden;-o-text-overflow:ellipsis; text-overflow:ellipsis;white-space:nowrap}</style><meta name="ResourceLoaderDynamicStyles" content="">
+
 <meta name="generator" content="MediaWiki 1.28.2">
-<link rel="shortcut icon" href="http://caving.soc.srcf.net/favicon.ico">
-<link rel="search" type="application/opensearchdescription+xml" href="http://caving.soc.srcf.net/wiki/opensearch_desc.php" title="Cambridge University Caving Club - CUCC wiki (en)">
-<link rel="EditURI" type="application/rsd+xml" href="http://caving.soc.srcf.net/wiki/api.php?action=rsd">
-<link rel="alternate" type="application/atom+xml" title="Cambridge University Caving Club - CUCC wiki Atom feed" href="http://caving.soc.srcf.net/wiki/index.php?title=Special:RecentChanges&amp;feed=atom">
-<script src="./Expo 2018_Who and When_files/load.php"></script><script src="./Expo 2018_Who and When_files/load(1).php"></script><script type="text/javascript">// Promises 
-var _eid_promises = {}; 
-// Turn the incoming message from extension 
-// into pending Promise resolving 
-window.addEventListener("message", function(event) { 
-    if(event.source !== window) return; 
-    if(event.data.src && (event.data.src === "background.js")) { 
-        console.log("Page received: "); 
-        console.log(event.data); 
-        // Get the promise 
-        if(event.data.nonce) { 
-            var p = _eid_promises[event.data.nonce]; 
-            // resolve 
-            if(event.data.result === "ok") { 
-                if(event.data.signature !== undefined) { 
-                    p.resolve({hex: event.data.signature}); 
-                } else if(event.data.version !== undefined) { 
-                    p.resolve(event.data.extension + "/" + event.data.version); 
-                } else if(event.data.cert !== undefined) { 
-                    p.resolve({hex: event.data.cert}); 
-                } else { 
-                    console.log("No idea how to handle message"); 
-                    console.log(event.data); 
-                } 
-            } else { 
-                // reject 
-                p.reject(new Error(event.data.result)); 
-            } 
-            delete _eid_promises[event.data.nonce]; 
-        } else { 
-            console.log("No nonce in event msg"); 
-        } 
-    } 
-}, false); 
- 
- 
-function TokenSigning() { 
-    function nonce() { 
-        var val = ""; 
-        var hex = "abcdefghijklmnopqrstuvwxyz0123456789"; 
-        for(var i = 0; i < 16; i++) val += hex.charAt(Math.floor(Math.random() * hex.length)); 
-        return val; 
-    } 
- 
-    function messagePromise(msg) { 
-        return new Promise(function(resolve, reject) { 
-            // amend with necessary metadata 
-            msg["nonce"] = nonce(); 
-            msg["src"] = "page.js"; 
-            // send message 
-            window.postMessage(msg, "*"); 
-            // and store promise callbacks 
-            _eid_promises[msg.nonce] = { 
-                resolve: resolve, 
-                reject: reject 
-            }; 
-        }); 
-    } 
-    this.getCertificate = function(options) { 
-        var msg = {type: "CERT", lang: options.lang, filter: options.filter}; 
-        console.log("getCertificate()"); 
-        return messagePromise(msg); 
-    }; 
-    this.sign = function(cert, hash, options) { 
-        var msg = {type: "SIGN", cert: cert.hex, hash: hash.hex, hashtype: hash.type, lang: options.lang, info: options.info}; 
-        console.log("sign()"); 
-        return messagePromise(msg); 
-    }; 
-    this.getVersion = function() { 
-        console.log("getVersion()"); 
-        return messagePromise({ 
-            type: "VERSION" 
-        }); 
-    }; 
-}</script></head>
+
+</head>
 <body class="mediawiki ltr sitedir-ltr mw-hide-empty-elt ns-0 ns-subject page-Expo_2018_Who_and_When rootpage-Expo_2018_Who_and_When skin-modern action-view">
 		<!-- heading -->
 		<div id="mw_header">
@@ -110,15 +25,7 @@ function TokenSigning() {
 						<div id="p-cactions" class="portlet" role="navigation">
 			<h3>Views</h3>
 
-			<div class="pBody">
-				<ul>
-				<li id="ca-nstab-main" class="selected"><a href="http://caving.soc.srcf.net/wiki/Expo_2018/Who_and_When" title="View the content page [Alt+Shift+c]" accesskey="c">Page</a></li>
-				<li id="ca-talk" class="new"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Talk:Expo_2018/Who_and_When&amp;action=edit&amp;redlink=1" rel="discussion" title="Discussion about the content page [Alt+Shift+t]" accesskey="t">Discussion</a></li>
-				<li id="ca-viewsource"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;action=edit" title="This page is protected.
-You can view its source [Alt+Shift+e]" accesskey="e">View source</a></li>
-				<li id="ca-history"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;action=history" title="Past revisions of this page [Alt+Shift+h]" accesskey="h">History</a></li>
-				</ul>
-							</div>
+
 		</div>
 	
 				<!-- content -->
@@ -1281,122 +1188,10 @@ Transclusion expansion time report (%,ms,calls,template)
 
 <!-- Saved in parser cache with key cucaving:pcache:idhash:793-0!*!*!!*!*!* and timestamp 20190812133858 and revision id 4949
  -->
-</div><div class="printfooter">
-Retrieved from "<a dir="ltr" href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;oldid=4949">http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;oldid=4949</a>"</div>
-						<div class="mw_clear"></div>
-						<div id="catlinks" class="catlinks catlinks-allhidden" data-mw="interface"></div>											</div><!-- mw_contentholder -->
-				</div><!-- mw_content -->
-			</div><!-- mw_contentwrapper -->
 
-			<div id="mw_portlets">
-				<h2>Navigation menu</h2>
-
-				<!-- portlets -->
-					<div class="generated-sidebar portlet" id="p-navigation" role="navigation">
-		<h3>Navigation</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Cambridge-University-Caving-Club"><a href="http://caving.soc.srcf.net/wiki/Main_Page">Cambridge University Caving Club</a></li>
-									</ul>
-					</div>
-		</div>
-		<div class="generated-sidebar portlet" id="p-Fresher_section" role="navigation">
-		<h3>Fresher section</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Calendar"><a href="http://caving.soc.srcf.net/wiki/Calendar">Calendar</a></li>
-											<li id="n-How-to-join"><a href="http://caving.soc.srcf.net/wiki/Important_information_for_caving">How to join</a></li>
-											<li id="n-Email-lists"><a href="http://caving.soc.srcf.net/wiki/Email_lists">Email lists</a></li>
-											<li id="n-Costs"><a href="http://caving.soc.srcf.net/wiki/Costs">Costs</a></li>
-											<li id="n-Gear"><a href="http://caving.soc.srcf.net/wiki/Gear">Gear</a></li>
-											<li id="n-Training"><a href="http://caving.soc.srcf.net/wiki/Training">Training</a></li>
-											<li id="n-Safety"><a href="http://caving.soc.srcf.net/wiki/Safety">Safety</a></li>
-									</ul>
-					</div>
-		</div>
-		<div class="generated-sidebar portlet" id="p-Knowledge" role="navigation">
-		<h3>Knowledge</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Trips-in-UK"><a href="http://caving.soc.srcf.net/wiki/Past_Meets">Trips in UK</a></li>
-											<li id="n-Trips-outside-UK"><a href="http://caving.soc.srcf.net/wiki/Outside_UK">Trips outside UK</a></li>
-											<li id="n-The-Expo"><a href="http://caving.soc.srcf.net/wiki/Expo">The Expo</a></li>
-											<li id="n-Library"><a href="http://caving.soc.srcf.net/wiki/Library">Library</a></li>
-											<li id="n-Photos"><a href="http://caving.soc.srcf.net/wiki/Photos">Photos</a></li>
-									</ul>
-					</div>
-		</div>
-		<div class="generated-sidebar portlet" id="p-Contacts" role="navigation">
-		<h3>Contacts</h3>
-		<div class="pBody">
-							<ul>
-											<li id="n-Committee"><a href="http://caving.soc.srcf.net/wiki/Contacts">Committee</a></li>
-											<li id="n-Caver-alumnus.3F"><a href="http://caving.soc.srcf.net/wiki/Excs">Caver alumnus?</a></li>
-									</ul>
-					</div>
-		</div>
-			<div id="p-search" class="portlet" role="search">
-			<h3><label for="searchInput">Search</label></h3>
-
-			<div id="searchBody" class="pBody">
-				<form action="https://camcaving.uk/wiki/index.php" id="searchform">
-					<input type="hidden" name="title" value="Special:Search">
-					<input type="search" name="search" placeholder="Search Cambridge University Caving Club - CUCC wiki" title="Search Cambridge University Caving Club - CUCC wiki [Alt+Shift+f]" accesskey="f" id="searchInput" autocomplete="off">
-					<input type="submit" name="go" value="Go" title="Go to a page with this exact name if it exists" id="searchGoButton" class="searchButton">&nbsp;
-						<input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton">
-				</form>
-
-							</div>
-		</div>
-			<div class="portlet" id="p-tb" role="navigation">
-			<h3>Tools</h3>
-
-			<div class="pBody">
-				<ul>
-											<li id="t-whatlinkshere"><a href="http://caving.soc.srcf.net/wiki/Special:WhatLinksHere/Expo_2018/Who_and_When" title="A list of all wiki pages that link here [Alt+Shift+j]" accesskey="j">What links here</a></li>
-											<li id="t-recentchangeslinked"><a href="http://caving.soc.srcf.net/wiki/Special:RecentChangesLinked/Expo_2018/Who_and_When" rel="nofollow" title="Recent changes in pages linked from this page [Alt+Shift+k]" accesskey="k">Related changes</a></li>
-											<li id="t-specialpages"><a href="http://caving.soc.srcf.net/wiki/Special:SpecialPages" title="A list of all special pages [Alt+Shift+q]" accesskey="q">Special pages</a></li>
-											<li id="t-print"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;printable=yes" rel="alternate" title="Printable version of this page [Alt+Shift+p]" accesskey="p">Printable version</a></li>
-											<li id="t-permalink"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;oldid=4949" title="Permanent link to this revision of the page">Permanent link</a></li>
-											<li id="t-info"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Expo_2018/Who_and_When&amp;action=info" title="More information about this page">Page information</a></li>
-									</ul>
-							</div>
-		</div>
-	
-			</div><!-- mw_portlets -->
-
-
-		</div><!-- main -->
+</div><!-- main -->
 
 		<div class="mw_clear"></div>
 
-		<!-- personal portlet -->
-		<div class="portlet" id="p-personal" role="navigation">
-			<h3>Personal tools</h3>
-
-			<div class="pBody">
-				<ul>
-											<li id="pt-createaccount"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Special:CreateAccount&amp;returnto=Expo+2018%2FWho+and+When" title="You are encouraged to create an account and log in; however, it is not mandatory">Create account</a></li>
-											<li id="pt-login"><a href="http://caving.soc.srcf.net/wiki/index.php?title=Special:UserLogin&amp;returnto=Expo+2018%2FWho+and+When" title="You are encouraged to log in; however, it is not mandatory [Alt+Shift+o]" accesskey="o">Log in</a></li>
-									</ul>
-			</div>
-		</div>
-
-
-		<!-- footer -->
-		<div id="footer" role="contentinfo">
-			<ul id="f-list">
-										<li id="lastmod"> This page was last modified on 8 August 2018, at 08:16.</li>
-											<li id="privacy"><a href="http://caving.soc.srcf.net/wiki/Cambridge_University_Caving_Club_-_CUCC_wiki:Privacy_policy" title="Cambridge University Caving Club - CUCC wiki:Privacy policy">Privacy policy</a></li>
-											<li id="about"><a href="http://caving.soc.srcf.net/wiki/Cambridge_University_Caving_Club_-_CUCC_wiki:About" title="Cambridge University Caving Club - CUCC wiki:About">About Cambridge University Caving Club - CUCC wiki</a></li>
-											<li id="disclaimer"><a href="http://caving.soc.srcf.net/wiki/Cambridge_University_Caving_Club_-_CUCC_wiki:General_disclaimer" title="Cambridge University Caving Club - CUCC wiki:General disclaimer">Disclaimers</a></li>
-								</ul>
-							<div id="mw_poweredby">
-											<a href="http://www.mediawiki.org/">Powered by MediaWiki</a>
-									</div>
-					</div>
-
-		<script>(window.RLQ=window.RLQ||[]).push(function(){mw.loader.load(["mediawiki.action.view.postEdit","site","mediawiki.user","mediawiki.hidpi","mediawiki.page.ready","mediawiki.searchSuggest"]);});</script><script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgBackendResponseTime":228});});</script>
-	
 
 		<div style="display: none; font-size: 13.3333px;" class="suggestions"><div class="suggestions-results"></div><div class="suggestions-special"></div></div></body></html>
\ No newline at end of file
