diff --git a/skeletons/book.xml b/skeletons/book.xml
index 61bb87f5c5..a883d0dede 100644
--- a/skeletons/book.xml
+++ b/skeletons/book.xml
@@ -3,14 +3,12 @@
  <title>Long title of extension</title>
  <titleabbrev>Extname</titleabbrev>
 
- <!-- {{{ preface -->
  <preface xml:id="intro.extname">
   &reftitle.intro;
   <simpara>
    Extension introduction.
   </simpara>
  </preface>
- <!-- }}} -->
 
  &reference.extname.setup;
  &reference.extname.constants;
diff --git a/skeletons/classname.xml b/skeletons/classname.xml
index 774d945cf6..d74516e898 100644
--- a/skeletons/classname.xml
+++ b/skeletons/classname.xml
@@ -5,19 +5,16 @@
  
  <partintro>
 
-  <!-- {{{ ClassName intro -->
   <section xml:id="classname.intro">
    &reftitle.intro;
    <simpara>
     Description of the class.
    </simpara>
   </section>
-  <!-- }}} -->
 
   <section xml:id="classname.synopsis">
    &reftitle.classsynopsis;
 
-   <!-- {{{ Synopsis -->
    <classsynopsis class="class">
     <ooclass>
      <classname>ClassName</classname>
@@ -90,7 +87,6 @@
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
-   <!-- }}} -->
 
   </section>
 
diff --git a/skeletons/exceptionname.xml b/skeletons/exceptionname.xml
index a305f33b4a..02347592b0 100644
--- a/skeletons/exceptionname.xml
+++ b/skeletons/exceptionname.xml
@@ -5,19 +5,16 @@
  
  <partintro>
  
-<!-- {{{ ExceptionName intro -->
   <section xml:id="exceptionname.intro">
    &reftitle.intro;
    <simpara>
     Description of the exception.
    </simpara>
   </section>
-<!-- }}} -->
 
   <section xml:id="exceptionname.synopsis">
    &reftitle.classsynopsis;
 
-   <!-- {{{ Synopsis -->
    <classsynopsis class="class">
     <ooclass>
      <classname>ExceptionName</classname>
diff --git a/skeletons/method.xml b/skeletons/method.xml
index a0f763d963..db25e61e1b 100644
--- a/skeletons/method.xml
+++ b/skeletons/method.xml
@@ -131,7 +131,7 @@ Procedural synopsis goes after OOP synopsis.
 <![CDATA[
 <?php
 if ($anexample === true) {
-    echo 'Use the PEAR Coding standards';
+    echo 'Use the latest PHP-FIG PER Coding style for PHP code examples: https://www.php-fig.org/per/coding-style/';
 }
 if ($thereisoutput === 'and it is multiple lines') {
     echo 'Use a screen like we did below';
diff --git a/skeletons/setup.xml b/skeletons/setup.xml
index 8826265373..940c9e2fce 100644
--- a/skeletons/setup.xml
+++ b/skeletons/setup.xml
@@ -3,35 +3,27 @@
  &reftitle.setup;
 
  <!-- Remove sections which are useless -->
- <!-- {{{ Requirements -->
  <section xml:id="extname.requirements">
   &reftitle.required;
   &no.requirement;
  </section>
- <!-- }}} -->
 
- <!-- {{{ Installation -->
  <section xml:id="extname.installation">
   &reftitle.install;
   &no.install;
  </section>
  <!-- or &reference.extname.entities.configure; -->
- <!-- }}} -->
 
- <!-- {{{ Configuration -->
  <section xml:id="extname.configuration">
   &reftitle.runtime;
   &no.config;
  </section>
  <!-- or &reference.extname.entities.ini; -->
- <!-- }}} -->
 
- <!-- {{{ Resources -->
  <section xml:id="extname.resources">
   &reftitle.resources;
   &no.resource;
  </section>
- <!-- }}} -->
 
 </chapter>
 <!-- Keep this comment at the end of the file