diff --git a/src/chrome/content/rules/AJC.com.xml b/src/chrome/content/rules/AJC.com.xml
index 7329529c63e8..e45f20f82011 100644
--- a/src/chrome/content/rules/AJC.com.xml
+++ b/src/chrome/content/rules/AJC.com.xml
@@ -12,24 +12,5 @@
 	<target host="store.ajc.com" />
 	<target host="subscribe.ajc.com" />
 
-	<!-- 
-	Rewrite rule must touch https to fix errors caused by the site adding
-	https to links that do not support it. When a user requests a page
-	on https://www.ajc.com, it often seems to add https to other ajc.com
-	links on that page regardless of whether or not the subdomain supports
-	https. This can be a problem because clicking on a https://ajc.com link
-	results in an invalid cert error. The rule fixes this by rewriting
-	https://ajc.com links (which don't support https) to https://www.ajc.com
-	links (which do support https).
-
-	Example:
-		https://www.ajc.com/news/local/woman-emory-doctors-left-camera-body-after-surgery/Ajt6yMsjByDAWJTLfkDCyM/
-		The Most Read sidebar on the above page (or most any other page) is
-		an example of behavior that necessitates the rule. https://ajc.com
-		links are created despite it not supporting https. Visiting that page
-		and clicking on one of the https://ajc.com links on the sidebar
-		(while the below rule is disabled) should reproduce the issue.
-	-->
-	<rule from="^https?://ajc\.com/" to="https://www.ajc.com/"/>
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Aeriagames.xml b/src/chrome/content/rules/Aeriagames.xml
index 64bd2e13e3c9..c6b659c61b25 100644
--- a/src/chrome/content/rules/Aeriagames.xml
+++ b/src/chrome/content/rules/Aeriagames.xml
@@ -1,37 +1,16 @@
 <!--
-	CDN buckets:
-
-		- wildcard.aeriastatic.com.edgekey.net
-
-			- c.aeriastatic.com
-
-		- static.aeriagames.com.edgesuite.net
-
-			- s.aeriastatic.com
-
-
-	Problematic domains:
-
-		- s.aeriastatic.com	(works, akamai)
+	CDN buckets
 
+		Updated CDN
+			- cms-content.s.aeriastatic.co
 -->
 <ruleset name="Aeriagames">
-<target host="www.aeriagames.com" />
-<target host="aeriagames.com" />
-	<target host="*.aeriastatic.com" />
-
-<rule from="^http://(?:www\.)?aeriagames\.com/" to="https://www.aeriagames.com/"/>
-
-	<rule from="^http://c\.aeriastatic\.com/"
-		to="https://c.aeriastatic.com/" />
-
-	<!--	We must rewrite from https://s to c due to protocol-relative
-		links on www.aeriagames.com:
-
-			- https://mail1.eff.org/pipermail/https-everywhere-rules/2013-July/001650.html
-			- https://bugzilla.mozilla.org/show_bug.cgi?id=879072#c1
-							-->
-	<rule from="^https?://s\.aeriastatic\.com/"
-		to="https://c.aeriastatic.com/" />
-
+	<target host="www.aeriagames.com" />
+	<target host="aeriagames.com" />
+	<target host="c.aeriastatic.com" />
+		<test url="http://c.aeriastatic.com/modules/js/AG/version1/assets/signupVerifier.css" />
+	<target host="cms-content.s.aeriastatic.com" />
+		<test url="http://cms-content.s.aeriastatic.com/82de179009b2505fcc419f60f4d98ab7/files/aurakingdom/image/F/Featured_Shinobi.jpg" />
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Cru.org.xml b/src/chrome/content/rules/Cru.org.xml
index 3645dbfe2f42..9295dbd66df2 100644
--- a/src/chrome/content/rules/Cru.org.xml
+++ b/src/chrome/content/rules/Cru.org.xml
@@ -12,17 +12,12 @@ Fetch error: http://cru.org/ => https://cru.org/: (51, "SSL: no alternative cert
 
 	<target host="cru.org" />
 	<target host="*.cru.org" />
-
+		<test url="http://sites.cru.org/" />
+		<test url="http://stage.cru.org/" />
+		<test url="http://jobs.cru.org/" />
 
 	<securecookie host="^(?:www\.)?cru\.org$" name=".+" />
 
-
-	<rule from="^http://(www\.)?cru\.org/"
-		to="https://$1cru.org/" />
-
-	<!--	Protocol-relative links from www:
-						-->
-	<rule from="^https?://static\.cru\.org/"
-		to="https://d2kuvqjqp132ic.cloudfront.net/" />
-
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/DailyDot.xml b/src/chrome/content/rules/DailyDot.xml
index 94f60b5acbd0..926abf660cfe 100644
--- a/src/chrome/content/rules/DailyDot.xml
+++ b/src/chrome/content/rules/DailyDot.xml
@@ -41,25 +41,15 @@
 <ruleset name="DailyDot.com (partial)" platform="mixedcontent">
 
 	<target host="dailydot.com" />
-	<target host="cdn0.dailydot.com" />
 	<target host="www.dailydot.com" />
 
-
 	<!--	Not secured by server:
 					-->
 	<securecookie host="^\.dailydot\.com$" name="^__qca$" />
 
-
 	<rule from="^http://dailydot\.com/"
 		to="https://www.dailydot.com/" />
 
-	<!--	s? for protocol-relative urls...:
-						-->
-	<rule from="^https?://cdn0\.dailydot\.com/"
-		to="https://dailydot.s3.amazonaws.com/" />
-
-		<test url="https://cdn0.dailydot.com/" />
-
 	<rule from="^http:"
 		to="https:" />
 
diff --git a/src/chrome/content/rules/Epic-Systems.xml b/src/chrome/content/rules/Epic-Systems.xml
index 05072ac544df..3438c713eda4 100644
--- a/src/chrome/content/rules/Epic-Systems.xml
+++ b/src/chrome/content/rules/Epic-Systems.xml
@@ -2,17 +2,17 @@
 
 	<target host="epic.com" />
 	<target host="*.epic.com" />
+		<test url="http://access.epic.com/" />
+		<test url="http://career.epic.com/" />
+		<test url="http://councils.epic.com/" />
+		<test url="http://eventregistration.epic.com/" />
+		<test url="http://sites.epic.com/" />
+		<test url="http://ugm.epic.com/" />
+		<test url="http://userweb.epic.com/" />
 
 	<securecookie host="^\w+\.epic\.com$" name=".+" />
 
-	<!--
-	     Prevent https://epic.com/ from redirecting to http://www.epic.com/
-	-->
-
-	<rule from="^https?://epic\.com/"
-		to="https://www.epic.com/" />
-
-	<rule from="^http://(access|careers|councils|eventregistration|sites|ugm|userweb|www)\.epic\.com/"
-		to="https://$1.epic.com/" />
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Fasthosts.xml b/src/chrome/content/rules/Fasthosts.xml
index 992f87023db2..7b496bef8645 100644
--- a/src/chrome/content/rules/Fasthosts.xml
+++ b/src/chrome/content/rules/Fasthosts.xml
@@ -10,37 +10,49 @@
 
 	<target host="fasthosts.co.uk" />
 	<target host="*.fasthosts.co.uk" />
+		<test url="http://admin.fasthosts.co.uk/" />
+		<test url="http://login.fasthosts.co.uk/" />
+		<test url="http://order.fasthosts.co.uk/" />
 	<target host="*.prositehosting.co.uk" />
 	<target host="ukreg.com" />
 	<target host="www.ukreg.com" />
 
-
 	<securecookie host="^.*\.fasthosts\.co\.uk$" name=".+" />
 	<securecookie host="^www\.ukreg\.com$" name=".+" />
 
+	<!--
+		2018 Update:
+		JS no longer in use at this path
 
-	<!--	https://trac.torproject.org/projects/tor/ticket/11373
+		https://trac.torproject.org/projects/tor/ticket/11373
 
 		Tracking script that redirects pages to http.
 
 		favicon picked simply because it is
 		(or should be) innocuous:
-						-->
-	<rule from="^https://www\.fasthosts\.co\.uk/js/track\.js"
-		to="https://www.fasthosts.co.uk/favicon.ico" />
+
+		<rule from="^https://www\.fasthosts\.co\.uk/js/track\.js"
+			to="https://www.fasthosts.co.uk/favicon.ico" />
+	-->
 
 	<!--	Cert only matches www.	-->
 	<rule from="^http://(?:www\.)?fasthosts\.co\.uk/"
 		to="https://www.fasthosts.co.uk/" />
 
-	<rule from="^http://(admin|login|order)\.fasthosts\.co\.uk/"
-		to="https://$1.fasthosts.co.uk/" />
-
 	<rule from="^http://secure(\d|1[0-3-9]|2[0-4]|5[26])\.prositehosting\.co\.uk/"
 		to="https://secure$1.prositehosting.co.uk/" />
+		<test url="http://secure32.prositehosting.co.uk/" />
+		<test url="http://secure4.prositehosting.co.uk/" />
+		<test url="http://secure3.prositehosting.co.uk/" />
+		<test url="http://secure5.prositehosting.co.uk/" />
+		<test url="http://secure6.prositehosting.co.uk/" />
+		<test url="http://secure41.prositehosting.co.uk/" />
+		<test url="http://secure33.prositehosting.co.uk/" />
 
 	<!--	Cert only matches www.	-->
 	<rule from="^http://(?:www\.)?ukreg\.com/"
 		to="https://www.ukreg.com/" />
 
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/First_Class_Magazine.se.xml b/src/chrome/content/rules/First_Class_Magazine.se.xml
index b52fb8e6a3b8..ce29e93f1d40 100644
--- a/src/chrome/content/rules/First_Class_Magazine.se.xml
+++ b/src/chrome/content/rules/First_Class_Magazine.se.xml
@@ -15,15 +15,7 @@
 	<target host="media.firstclassmagazine.se" />
 	<target host="www.firstclassmagazine.se" />
 
-
 	<securecookie host="^\." name="^__cfduid$" />
 
-
-	<!--	s? for protocol-relative includes:
-							-->
-	<rule from="^https?://www\.firstclassmagazine\.se/"
-		to="https://firstclassmagazine.se/" />
-
 	<rule from="^http:" to="https:" />
-
 </ruleset>
diff --git a/src/chrome/content/rules/Intelliworks_Chat.com.xml b/src/chrome/content/rules/Intelliworks_Chat.com.xml
index 5a05a54b1bd9..8d379e3b6107 100644
--- a/src/chrome/content/rules/Intelliworks_Chat.com.xml
+++ b/src/chrome/content/rules/Intelliworks_Chat.com.xml
@@ -1,4 +1,6 @@
 <!--
+	Domains expired
+
 	Problematic subdomains:
 
 		- ^ ¹
@@ -8,23 +10,11 @@
 	² Mismatched, CN: liveleader.com
 
 -->
-<ruleset name="Intelliworks Chat.com">
+<ruleset name="Intelliworks Chat.com" default_off="expired">
 
 	<target host="intelliworkschat.com" />
-	<target host="*.intelliworkschat.com" />
-
-
-	<!--	Redirect drops path and args:
-						-->
-	<rule from="^http://intelliworkschat\.com/.*"
-		to="https://www.intelliworkschat.com/" />
-
-	<rule from="^http://www\.intelliworkschat\.com/"
-		to="https://www.intelliworkschat.com/" />
-
-	<!--	s? for redirect from /poll.../$:
-						-->
-	<rule from="^https?://(?:www\.)?poll\.intelliworkschat\.com/"
-		to="https://poll.intelliworkschat.com/" />
+	<target host="poll.intelliworkschat.com" />
 
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/KKH.de.xml b/src/chrome/content/rules/KKH.de.xml
index 3ff3faafe4a2..8562fec16052 100644
--- a/src/chrome/content/rules/KKH.de.xml
+++ b/src/chrome/content/rules/KKH.de.xml
@@ -12,14 +12,7 @@ Fetch error: http://stats.kkh-allianz.de/ => https://stats.kkh-allianz.de/: (60,
 <ruleset name="KKH.de" default_off='failed ruleset test'>
 <target host="www.kkh.de" />
 <target host="kkh.de" />
-<target host="www.kkh-allianz.de" />
-<target host="kkh-allianz.de" />
-<target host="stats.kkh-allianz.de" />
 
-<test    url="https://www.kkh-allianz.de/" />
-<test    url="https://kkh-allianz.de/" />
-
-<rule from="^http://kkh\.de/"                   to="https://www.kkh.de/" />
-<rule from="^https?://(www\.)?kkh-allianz\.de/" to="https://www.kkh.de/" />
+<rule from="^http://kkh\.de/" to="https://www.kkh.de/" />
 <rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Khalsa-Credit-Union.xml b/src/chrome/content/rules/Khalsa-Credit-Union.xml
index 7faec0fdb499..df684a00b59c 100644
--- a/src/chrome/content/rules/Khalsa-Credit-Union.xml
+++ b/src/chrome/content/rules/Khalsa-Credit-Union.xml
@@ -5,11 +5,9 @@
 
 <ruleset name="Khalsa Credit Union">
 	<target host="khalsacreditunion.ca" />
-	<target host="www.khalsacreditunion.ca" />
+	<!-- <target host="www.khalsacreditunion.ca" /> -->
 
 	<securecookie host=".+" name=".+" />
 
-	<rule from="^https?://khalsacreditunion\.ca/" to="https://www.khalsacreditunion.ca/" />
-		<test url="https://khalsacreditunion.ca/" />
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Knappschaft-Bahn-See.xml b/src/chrome/content/rules/Knappschaft-Bahn-See.xml
index 55f1a55a7aaa..d75e5d685f23 100644
--- a/src/chrome/content/rules/Knappschaft-Bahn-See.xml
+++ b/src/chrome/content/rules/Knappschaft-Bahn-See.xml
@@ -2,24 +2,11 @@
 	Domains without SSL/TLS:
 		kbs-jobboerse.de
 		willkommen-im-job.de
--->	
+-->
 <ruleset name="Knappschaft-Bahn-See.de">
-<target host="www.kbs.de" />
-<target host=    "kbs.de" />
-<target host="www.knappschaft-bahn-see.de" />
-<target host=    "knappschaft-bahn-see.de" />
 <target host="www.knappschaft.de" />
-<target host=    "knappschaft.de" />
+<target host="knappschaft.de" />
 
-<test url="https://www.knappschaft-bahn-see.de/" />
-<test url="https://knappschaft.de/" />
-
-<rule from="^http://kbs\.de/"
-	to="https://www.kbs.de/" />
-<rule from="^https?://(www\.)?knappschaft-bahn-see\.de/"
-	to="https://www.kbs.de/" />
-<rule from="^https?://knappschaft\.de/"
-	to="https://www.knappschaft.de/" />
 <rule from="^http:"
 	to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/MoveOn.xml b/src/chrome/content/rules/MoveOn.xml
index d0842b33f7ca..52889e776c5e 100644
--- a/src/chrome/content/rules/MoveOn.xml
+++ b/src/chrome/content/rules/MoveOn.xml
@@ -72,20 +72,9 @@
 
 	<securecookie host="^\w" name=".+" />
 
-
 	<rule from="^http://s3\.moveon\.org/"
 		to="https://s3.amazonaws.com/s3.moveon.org/" />
 
-	<!--	A protocol-relative reference
-		exists on petitions.moveon.org:
-						-->
-	<rule from="^https?://static\.petitions\.moveon\.org/"
-		to="https://d83190g0d3lhr.cloudfront.net/" />
-
-		<!--	Specifically:
-					-->
-		<test url="https://static.petitions.moveon.org/css/front.css" />
-
 	<rule from="^http:"
 		to="https:" />
 
diff --git a/src/chrome/content/rules/Necuhb.xml b/src/chrome/content/rules/Necuhb.xml
index c49c9b48fe04..fa653cc71fdb 100644
--- a/src/chrome/content/rules/Necuhb.xml
+++ b/src/chrome/content/rules/Necuhb.xml
@@ -1,12 +1,12 @@
 <ruleset name="Northeast Credit Union" platform="mixedcontent">
-  <target host="necuhb.org" />
+  <!--
+    Failed to connect port 443
+
+    <target host="necuhb.org" />
+  -->
   <target host="necu.org" />
   <target host="www.necu.org" />
-  <target host="*.necuhb.org" />
-
-  <rule from="^http://([^/:@]*)\.necuhb\.org/"
-          to="https://$1.necuhb.org/"/>
 
-  <rule from="^https://(www\.)?necu\.org/"
-          to="https://$1necu.org/"/>
+  <rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Pair-Networks.xml b/src/chrome/content/rules/Pair-Networks.xml
index b0164bf55649..8494d5420bce 100644
--- a/src/chrome/content/rules/Pair-Networks.xml
+++ b/src/chrome/content/rules/Pair-Networks.xml
@@ -7,45 +7,25 @@
 		- blog.pairnic.com		(cert: *.pair.com; redirects there)
 		- (www.)pairvps.com
 		- (www.)quickserve.com		(ditto)
-
 -->
 <ruleset name="pair Networks (partial)">
 
-	<target host="eliminatejunkemail.com" />
-	<target host="www.eliminatejunkemail.com" />
 	<target host="pair.com" />
 	<target host="*.pair.com" />
+		<test url="http://webmail.pair.com/" />
+		<test url="http://waitak.pair.com/" />
+		<test url="http://vondu.pair.com/" />
 	<target host="pairlite.com" />
-	<target host="*.pairlite.com" />
 	<target host="pairnic.com" />
 	<target host="*.pairnic.com" />
-		<exclusion pattern="http://(?:cpan|whois)\.pairnic\." />
-
+		<test url="http://gift.pairnic.com/" />
+		<test url="http://dynamic.pairnic.com/" />
+		<test url="http://comingsoon.pairnic.com/" />
+	<!-- 2018: New Domain for service-->
+	<target host="pairdomains.com" />
 
 	<securecookie host="^(?:.*\.)?pairnic\.com$" name=".+" />
 
-
-	<!--	- Cert mismatch
-		- Redirects like so over http.
-					-->
-	<rule from="^https://(?:www\.)?eliminatejunkemail\.com/"
-		to="https://www.pairnic.com/" />
-
-	<!--	Pages differ between http & https.
-							-->
-	<rule from="^http://(www\.)?pair\.com/(assets|static)/"
-		to="https://$1pair.com/$2/" />
-
-	<rule from="^http://(my|promote|static|(?:(?:[as]m|my|rc|sm)\.)?webmail)\.pair\.com/"
-		to="https://$1.pair.com/" />
-
-	<rule from="^http://(www\.)?pairlite\.com/(images/|signup/|styles01\.css)"
-		to="https://$1pairlite.com/$2" />
-
-	<rule from="^http://(my|webmail)\.pairlite\.com/"
-		to="https://$1.pairlite.com/" />
-
-	<rule from="^http://(www\.)?pairnic\.com/"
-		to="https://$1pairnic.com/" />
-
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Perfect_Audience.xml b/src/chrome/content/rules/Perfect_Audience.xml
index d2246cd288d2..03c9d17e7fa0 100644
--- a/src/chrome/content/rules/Perfect_Audience.xml
+++ b/src/chrome/content/rules/Perfect_Audience.xml
@@ -41,25 +41,12 @@
 	<!--	Complications:
 				-->
 	<target host="ads.perfectaudience.com" />
-	<target host="blog.perfectaudience.com" />
-
 
 	<securecookie host="^www\.perfectaudience\.com$" name=".+" />
 
-
 	<rule from="^http://ads\.perfectaudience\.com/"
 		to="https://ib.adnxs.com/" />
 
-	<!--	Protocol-relative links to blog
-		exist on perfectaudienc:
-						-->
-	<rule from="^https?://blog\.perfectaudience\.com/"
-		to="https://perfectaudienc.wpengine.com/" />
-
-		<test url="https://blog.perfectaudience.com/2015/01/29/publisher-spotlight-targeting-experienced-developer-audience-thinkster/" />
-
 	<rule from="^http:"
 		to="https:" />
-
-
 </ruleset>
diff --git a/src/chrome/content/rules/VEVO.xml b/src/chrome/content/rules/VEVO.xml
index bbe1df6a6954..195b255a901d 100644
--- a/src/chrome/content/rules/VEVO.xml
+++ b/src/chrome/content/rules/VEVO.xml
@@ -34,27 +34,11 @@
 	<target host="scache.vevo.com" />
 	<target host="www.vevo.com" />
 	<target host="aws-cache.vevocdn.com" />
-
+		<test url="http://aws-cache.vevocdn.com/assets/images/57598f48-11cc-47c0-9496-0c3c0a0b0d7b.png?width=281&amp;height=159&amp;resize=fill" />
 	<test url="http://scache.vevo.com/Content/VevoImages/artist/62AE5CCE473B998AFD2DB55B659E23E32013167114452900.jpg?width=98&amp;height=98&amp;resize=round" />
 
 	<rule from="^http://cache\.vevo\.com/"
 		to="https://scache.vevo.com/" />
 
-	<!-- www.vevo.com makes relative references to //img.cache.vevo.com/ -->
-	<rule from="^https?://img\.cache\.vevo\.com/"
-		to="https://scache.vevo.com/" />
-
-		<test url="https://img.cache.vevo.com/" />
-		<test url="http://img.cache.vevo.com/Content/VevoImages/artist/62AE5CCE473B998AFD2DB55B659E23E32013167114452900.jpg?width=98&amp;height=98&amp;resize=round" />
-		<test url="https://img.cache.vevo.com/Content/VevoImages/artist/62AE5CCE473B998AFD2DB55B659E23E32013167114452900.jpg?width=98&amp;height=98&amp;resize=round" />
-
-	<!-- www.vevo.com makes relative references to //aws-cache.vevocdn.com/ -->
-	<rule from="^https?://aws-cache\.vevocdn\.com/"
-		to="https://aws-cache.vevo.com/" />
-
-		<test url="https://aws-cache.vevocdn.com/" />
-		<test url="http://aws-cache.vevocdn.com/assets/images/57598f48-11cc-47c0-9496-0c3c0a0b0d7b.png?width=281&amp;height=159&amp;resize=fill" />
-		<test url="https://aws-cache.vevocdn.com/assets/images/57598f48-11cc-47c0-9496-0c3c0a0b0d7b.png?width=281&amp;height=159&amp;resize=fill" />
-
 	<rule from="^http:"	to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Yimg.com.xml b/src/chrome/content/rules/Yimg.com.xml
index cc8045de2e46..3cbad3324f5a 100644
--- a/src/chrome/content/rules/Yimg.com.xml
+++ b/src/chrome/content/rules/Yimg.com.xml
@@ -1,4 +1,8 @@
 <!--
+
+	Update (2018)
+		- Yming.com expired
+
 	For other Yahoo! coverage, see Yahoo.xml.
 
 
@@ -69,44 +73,19 @@
 			- sxh
 			- sxp
 			- qos.video
-
-
 -->
-<ruleset name="Yimg.com (partial)">
-
-	<target host="*.yimg.com" />
+<ruleset name="Yimg.com (partial)" default_off="expired">
 
+	<target host="www.yimg.com" />
+	<target host="1.yimg.com" />
+	<target host="i.yimg.com" />
+	<target host="l.yimg.com" />
+	<target host="s.yimg.com" />
+	<target host="sxh.yimg.com" />
+	<target host="xa.yimg.com" />
 
 	<securecookie host="^\.s\.yimg\.com$" name=".+" />
 
-
-	<rule from="^http://ads\.yimg\.com/"
-		to="https://s.yimg.com/" />
-
-	<!--	- l1 to l7 exist.
-		- a appears equivalent to l, except hosted on Akamai.
-			-->
-	<rule from="^http://(?:d\d?|(?:a\.)?l\d?|us\.(?:a2|i1|js2?))\.yimg\.com/(?:a|d|us(?:\.js)?\.yimg\.com)/"
-		to="https://s.yimg.com/lq/" />
-
-	<rule from="^http://(?:d\d?|au\.i1|(?:a\.)?l\d?|mail)\.yimg\.com/(ao|bm|ck|cv|dh|ea|ep|f|fv|fz|iu|jc|kj|kx|lo|mi|mq|na|nt|ok|pj|pp|pu|qa|qj|qk|qo|rb|rf|rq|rx|rz|sr|ss|tu|ugcwidgets|zz|aunz\.yimg\.com)/"
-		to="https://s.yimg.com/$1/" />
-
-	<rule from="^http://(?:d\d?|(?:a\.)?l\d?|us\.(?:a1|js1?)|mail|xa)\.yimg\.com/(bb|bt|dg|(?:eur|us)\.yimg\.com|fg|fp|[ghijqt]|gh|ho|j[ghn]|kq|lh|lm|ml|nn|nq|os|pb|pv|qb|qw|qx|qz|r[luw]|sc|ts)/"
-		to="https://s.yimg.com/zz/$1/" />
-
-	<rule from="^http://(tw\.bid|tw\.buy|ci-[\da-f]{10}-\d{8}\.http\.atlas\.cdn|ec|ext|tw\.m|s(?:1|2|3|ec|p)?|tw|qos\.video)\.yimg\.com/"
-		to="https://$1.yimg.com/" />
-
-	<rule from="^http://s?(ep|xh|xp)\.yimg\.com/"
-		to="https://s$1.yimg.com/" />
-
-	<rule from="^http://movienewsletters\.o\.yimg\.com/"
-		to="https://www.movienewsletters.net/" />
-
-	<!--	s://developer. breakage
-					-->
-	<rule from="^https://s\.yimg\.com/common/img/"
-		to="https://s.yimg.com/kj/ydn/common/img/" />
-
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/basekit.com.xml b/src/chrome/content/rules/basekit.com.xml
index 5cecc1ad2217..86e3edc7a1cf 100644
--- a/src/chrome/content/rules/basekit.com.xml
+++ b/src/chrome/content/rules/basekit.com.xml
@@ -1,4 +1,7 @@
 <!--
+	2018 Update:
+	custom-css.basekit.com redirects to basekit.com
+
 	Invalid certificate:
 		custom-css.basekit.com
 		docs.basekit.com
@@ -24,13 +27,12 @@
 
 		<test url="http://apidocs.basekit.com/" />
 		<test url="http://developers.basekit.com/" />
-		<test url="http://partners.basekit.com/" />
 		<test url="http://resellers.basekit.com/" />
 		<test url="http://scottishculture.basekit.com/" />
 		<test url="http://support.basekit.com/" />
 		<test url="http://trivia.basekit.com/" />
 		<test url="http://try.basekit.com/" />
-	
+
 		<exclusion pattern="^http://(docs|resources|knowledge)\.basekit\.com/" />
 
 			<test url="http://docs.basekit.com/" />
@@ -39,15 +41,6 @@
 
 	<securecookie host=".+" name=".+" />
 
-	<!--	s? for protocol-relative inclusion
-		on 'resellers', 'try':
-						-->
-	<rule from="^https?://custom-css\.basekit\.com/"
-		to="https://d282ykz6vx01th.cloudfront.net/" />
-
-		<test url="http://custom-css.basekit.com/" />
-		<test url="https://custom-css.basekit.com/live292640_site_41.css" />
-
 	<rule from="^http:"
 		to="https:" />
 
diff --git a/src/chrome/content/rules/spectator.co.uk.xml b/src/chrome/content/rules/spectator.co.uk.xml
index 9c9e07ddf924..d571625656bb 100644
--- a/src/chrome/content/rules/spectator.co.uk.xml
+++ b/src/chrome/content/rules/spectator.co.uk.xml
@@ -1,4 +1,10 @@
 <!--
+
+2018:
+	CDN buckets no longer in use and this site is now setting redirects for content urls. We should allow that to occur
+
+
+2016
 	For rules causing MCB, see spectator.co.uk-mixedcontent.xml.
 
 	CDN buckets:
@@ -47,36 +53,11 @@
 
 	<!--	Direct rewrites:
 				-->
-	<!--target host="spectator.co.uk" /-->
+	<!-- <target host="spectator.co.uk" /> -->
 	<!--target host="blogs.spectator.co.uk" /-->
 	<target host="health.spectator.co.uk" />
-	<!--target host="www.spectator.co.uk" /-->
-
-	<!--	Complications:
-				-->
-	<target host="cdn.spectator.co.uk" />
-	<target host="cdn2.spectator.co.uk" />
-
-
-	<!--	s? for protocol-relative
-		inclusions on www:
-					-->
-	<rule from="^https?://cdn\.spectator\.co\.uk/"
-		to="https://d31orrwkxpucnl.cloudfront.net/" />
-
-		<test url="http://cdn.spectator.co.uk/content/uploads/2016/04/LIKE-The-Haystack-late-April-1844-William-Henry-Fox-Talbot-%E2%88%8F-National-Media-Museum-SSPL-395x261.jpg" />
-		<test url="https://cdn.spectator.co.uk/content/uploads/2016/04/TRA0880_v012-114x76.1025.jpg" />
-
-	<!--	s? for protocol-relative
-		inclusions on www:
-					-->
-	<rule from="^https?://cdn2\.spectator\.co\.uk/"
-		to="https://d35f2nn85hoamp.cloudfront.net/" />
-
-		<test url="http://cdn2.spectator.co.uk/files/2016/05/OP-114x76.jpg" />
-		<test url="https://cdn2.spectator.co.uk/files/2016/05/wat-114x76.jpg" />
+	<!-- <target host="www.spectator.co.uk" /> -->
 
 	<rule from="^http:"
 		to="https:" />
-
 </ruleset>
diff --git a/src/chrome/content/rules/yWorks.com.xml b/src/chrome/content/rules/yWorks.com.xml
index 90a6242fe090..5b764d6966fe 100644
--- a/src/chrome/content/rules/yWorks.com.xml
+++ b/src/chrome/content/rules/yWorks.com.xml
@@ -1,8 +1,6 @@
 <ruleset name="yWorks.com">
-<target host="www.yworks.com" />
-<target     host="yworks.com" />
-<target host="www.yworks.de" />
-<target     host="yworks.de" />
-<rule from="^https?://(?:www\.)?yworks\.(?:com|de)/"
-         to="https://www.yworks.com/" />
-</ruleset>
+    <target host="www.yworks.com" />
+    <target     host="yworks.com" />
+
+    <rule from="^http:"	to="https:" />
+</ruleset>
\ No newline at end of file