diff --git a/CertificationPracticeStatement.html b/CertificationPracticeStatement.html
index 0c7de01..8263fac 100755
--- a/CertificationPracticeStatement.html
+++ b/CertificationPracticeStatement.html
@@ -234,12 +234,11 @@ for each class of certificate.
     <p class="q"> .x will change to .1 in the first approved instance.</p>
   </li>
   <li>
-    &copy; CAcert Inc. 2006-2009.
+    &copy; CAcert Inc.
     <!-- note that CCS policies must be controlled by CAcert Inc. -->
   </li>
   <li>
-    Issued under the CAcert document licence policy,
-    as and when made policy.
+    Licensed under the CAcert document licence.
     See <a href="http://wiki.cacert.org/wiki/PolicyDrafts/DocumentLicence">
     PolicyDrafts/DocumentLicence</a>.
      <ul class="q">
@@ -274,14 +273,6 @@ for each class of certificate.
     and must disappear in the POLICY.
     </span>
   </li>
-<!--
-  <li>
-    Some content is incorporated under
-<!--     <a href="http://xkcd.com/license.html">Creative Commons license</a> -->
-<!--     from <a href="http://xkcd.com/">xkcd.com</a>. -->
-    198 177 515
-  </li>
--->
 </ul>
 
 <p>
@@ -573,8 +564,6 @@ for these applications:
     in any application that requires or expects identity.
 </li></ul>
 
-<!-- <center><a href="http://xkcd.com/341/"> <img src="http://imgs.xkcd.com/comics/1337_part_1.png"> </a> </center> -->
-
 <h4><a name="p1.4.4" id="p1.4.4">1.4.4. Limited certificate uses</a></h4>
 
 <p>
@@ -1213,8 +1202,6 @@ Email addresses are verified according to
 <a href="#p4.2.2">&sect;4.2.2.</a>
 </p>
 
-<!-- <center><a href="http://xkcd.com/327/"> <img src="http://imgs.xkcd.com/comics/exploits_of_a_mom.png"> </a> </center> -->
-
 <h4><a name="p3.1.3" id="p3.1.3">3.1.3. Anonymity or pseudonymity of subscribers</a></h4>
 
 <p>
@@ -1550,10 +1537,6 @@ Each Member is assured according to Assurance Policy
 (<a href="http://www.cacert.org/policy/AssurancePolicy.php">COD13</a>).
 </p>
 
-<!-- <center><a href="http://xkcd.com/364/"> <img src="http://imgs.xkcd.com/comics/responsible_behavior.png"> </a> </center> -->
-
-
-
 <p>
 <b>Certificates.</b>
 Based on the total number of Assurance Points
@@ -1992,8 +1975,6 @@ and the Organisation Handbook.
 
 <h3><a name="p4.3" id="p4.3">4.3. Certificate issuance</a></h3>
 
-
-<!-- <a href="http://xkcd.com/153/"> <img align="right" src="http://imgs.xkcd.com/comics/cryptography.png"> </a> -->
 <h4><a name="p4.3.1" id="p4.3.1">4.3.1. CA actions during certificate issuance</a></h4>
 
 <p>
@@ -2409,7 +2390,6 @@ or servers within that organisation,
 but the Organisation is the responsible person.
 </p>
 
-<!-- <a href="http://xkcd.com/424/"> <img align="right" src="http://imgs.xkcd.com/comics/security_holes.png"> </a>  -->
 <p>
 <b>Software Agent.</b>
 If a Member is relying on a CAcert root embedded in
@@ -2612,8 +2592,6 @@ No stipulation.
 <!-- *************************************************************** -->
 <h2><a name="p5" id="p5">5. FACILITY, MANAGEMENT, AND OPERATIONAL CONTROLS</a></h2>
 
-<!-- <a href="http://xkcd.com/87/"> <img align="right" src="http://imgs.xkcd.com/comics/velociraptors.jpg"> </a>  -->
-
 <h3><a name="p5.1" id="p5.1">5.1. Physical controls</a></h3>
 
 <p>
@@ -2758,7 +2736,6 @@ Roles strive in general for separation of duties, either along the lines of
 <p>
 Refer to Security Policy 9.1.3 (<a href="http://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>).
 </p>
-<!-- <a href="http://xkcd.com/538/"> <img align="right" src="http://imgs.xkcd.com/comics/security.png"> </a> -->
 
 <h4><a name="p5.3.3" id="p5.3.3">5.3.3. Training requirements</a></h4>
 <p>No stipulation.</p>
@@ -2943,8 +2920,6 @@ the same, save for some other party filing the dispute.
 <h2><a name="p6" id="p6">6. TECHNICAL SECURITY CONTROLS</a></h2>
 
 
-<!-- <a href="http://xkcd.com/221/"> <img align="right" src="http://imgs.xkcd.com/comics/random_number.png"> </a> -->
-
 <h3><a name="p6.1" id="p6.1">6.1. Key Pair Generation and Installation</a></h3>
 
 <h4><a name="p6.1.1" id="p6.1.1">6.1.1. Key Pair Generation</a></h4>
@@ -3050,8 +3025,6 @@ This is effected by means of the 'template' system.
 
 
 
-<!-- <a href="http://xkcd.com/257/"> <img align="right" src="http://imgs.xkcd.com/comics/code_talkers.png"> </a> -->
-
 <h3><a name="p6.2" id="p6.2">6.2. Private Key Protection and Cryptographic Module Engineering Controls</a></h3>
 
 
@@ -3426,8 +3399,6 @@ networks, law (including multijurisdictional issues),
 identity systems, fraud, IT management.
 </p>
 
-<!-- <center><a href="http://xkcd.com/511/"> <img src="http://imgs.xkcd.com/comics/sleet.png"> </a> </center> -->
-
 <p>
 <b>Code Auditors.</b>
 See Security Policy, sections 7, 9.1.
@@ -3622,7 +3593,6 @@ or rulings by Arbitrator.
 
 <h3><a name="p9.4" id="p9.4">9.4. Privacy of personal information</a></h3>
 
-<!-- <center><a href="http://xkcd.com/46/"> <img src="http://imgs.xkcd.com/comics/secrets.jpg"> </a> </center> -->
 <p>
 Privacy is covered by the
 CCA (COD9)
@@ -3697,8 +3667,6 @@ and the commitment to security of Members,
 some deviations are necessary.
 </p>
 
-<!-- <center><a href="http://xkcd.com/225/"> <img src="http://imgs.xkcd.com/comics/open_source.png"> </a> </center> -->
-
 <h4><a name="p9.5.1" id="p9.5.1">9.5.1. Ownership and Licence</a></h4>
 
 <p>