diff --git a/package.xml b/package.xml
index 3a12e98..38ec4b6 100644
--- a/package.xml
+++ b/package.xml
@@ -1024,6 +1024,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/package_generic.xml b/package_generic.xml
index c1d0420..8e29083 100644
--- a/package_generic.xml
+++ b/package_generic.xml
@@ -383,6 +383,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/package_geshi.xml b/package_geshi.xml
index 4c07aac..84fd09a 100644
--- a/package_geshi.xml
+++ b/package_geshi.xml
@@ -110,6 +110,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/package_geshi11x.xml b/package_geshi11x.xml
index a0fc7ce..175592c 100644
--- a/package_geshi11x.xml
+++ b/package_geshi11x.xml
@@ -107,6 +107,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/package_ide.xml b/package_ide.xml
index 197ebc9..54e3e25 100644
--- a/package_ide.xml
+++ b/package_ide.xml
@@ -159,6 +159,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/package_pear.xml b/package_pear.xml
index 7e3ba6e..b66d21b 100644
--- a/package_pear.xml
+++ b/package_pear.xml
@@ -337,6 +337,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/package_php.xml b/package_php.xml
index 3fca458..e1cf650 100644
--- a/package_php.xml
+++ b/package_php.xml
@@ -384,6 +384,3 @@
   </changelog>
 
 </package>
-<!--
-vim: et sw=2 ts=2
--->
diff --git a/phpdotnet/phd/Autoloader.php b/phpdotnet/phd/Autoloader.php
index 05f1c40..884d839 100644
--- a/phpdotnet/phd/Autoloader.php
+++ b/phpdotnet/phd/Autoloader.php
@@ -30,7 +30,4 @@ class Autoloader
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Config.php b/phpdotnet/phd/Config.php
index 686870a..a80a0a8 100644
--- a/phpdotnet/phd/Config.php
+++ b/phpdotnet/phd/Config.php
@@ -184,7 +184,4 @@ class Config
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Format.php b/phpdotnet/phd/Format.php
index 4441732..3f8b8de 100644
--- a/phpdotnet/phd/Format.php
+++ b/phpdotnet/phd/Format.php
@@ -616,8 +616,3 @@ abstract class Format extends ObjectStorage
         return $tree;
     }
 }
-
-/*
-* vim600: sw=4 ts=4 fdm=syntax syntax=php et
-* vim<600: sw=4 ts=4
-*/
diff --git a/phpdotnet/phd/Format/Abstract/Manpage.php b/phpdotnet/phd/Format/Abstract/Manpage.php
index 845e185..236b4c9 100644
--- a/phpdotnet/phd/Format/Abstract/Manpage.php
+++ b/phpdotnet/phd/Format/Abstract/Manpage.php
@@ -52,7 +52,4 @@ abstract class Format_Abstract_Manpage extends Format {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Format/Abstract/PDF.php b/phpdotnet/phd/Format/Abstract/PDF.php
index 5aea11f..84f1ea3 100644
--- a/phpdotnet/phd/Format/Abstract/PDF.php
+++ b/phpdotnet/phd/Format/Abstract/PDF.php
@@ -906,7 +906,4 @@ class PdfWriter {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Format/Abstract/XHTML.php b/phpdotnet/phd/Format/Abstract/XHTML.php
index 2f772da..07938cb 100644
--- a/phpdotnet/phd/Format/Abstract/XHTML.php
+++ b/phpdotnet/phd/Format/Abstract/XHTML.php
@@ -125,7 +125,4 @@ abstract class Format_Abstract_XHTML extends Format {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Format/Factory.php b/phpdotnet/phd/Format/Factory.php
index 0e6e548..a5aa6b4 100644
--- a/phpdotnet/phd/Format/Factory.php
+++ b/phpdotnet/phd/Format/Factory.php
@@ -76,7 +76,4 @@ abstract class Format_Factory {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Highlighter.php b/phpdotnet/phd/Highlighter.php
index b32a371..db82b55 100644
--- a/phpdotnet/phd/Highlighter.php
+++ b/phpdotnet/phd/Highlighter.php
@@ -85,7 +85,4 @@ class Highlighter
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Highlighter/GeSHi.php b/phpdotnet/phd/Highlighter/GeSHi.php
index dc6aa04..f086746 100644
--- a/phpdotnet/phd/Highlighter/GeSHi.php
+++ b/phpdotnet/phd/Highlighter/GeSHi.php
@@ -85,7 +85,4 @@ class Highlighter_GeSHi extends Highlighter
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Highlighter/GeSHi11x.php b/phpdotnet/phd/Highlighter/GeSHi11x.php
index 20ce1be..3acca71 100644
--- a/phpdotnet/phd/Highlighter/GeSHi11x.php
+++ b/phpdotnet/phd/Highlighter/GeSHi11x.php
@@ -140,7 +140,4 @@ class Highlighter_GeSHi11x extends Highlighter
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Index.php b/phpdotnet/phd/Index.php
index ab612f0..0181067 100644
--- a/phpdotnet/phd/Index.php
+++ b/phpdotnet/phd/Index.php
@@ -529,7 +529,4 @@ SQL;
 }
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/MediaManager.php b/phpdotnet/phd/MediaManager.php
index 3dda7ce..09a73e4 100644
--- a/phpdotnet/phd/MediaManager.php
+++ b/phpdotnet/phd/MediaManager.php
@@ -146,7 +146,4 @@ class MediaManager
 
 }//class MediaManager
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/ObjectStorage.php b/phpdotnet/phd/ObjectStorage.php
index 5810d55..7b6416f 100644
--- a/phpdotnet/phd/ObjectStorage.php
+++ b/phpdotnet/phd/ObjectStorage.php
@@ -20,7 +20,4 @@ class ObjectStorage extends \SplObjectStorage
 }
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Options/Handler.php b/phpdotnet/phd/Options/Handler.php
index df3c7c2..d65dde5 100644
--- a/phpdotnet/phd/Options/Handler.php
+++ b/phpdotnet/phd/Options/Handler.php
@@ -493,7 +493,4 @@ Most options can be passed multiple times for greater effect.
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Options/Interface.php b/phpdotnet/phd/Options/Interface.php
index a2a77f4..aac0770 100644
--- a/phpdotnet/phd/Options/Interface.php
+++ b/phpdotnet/phd/Options/Interface.php
@@ -7,7 +7,3 @@ interface Options_Interface {
 
 }
 
-/*
- * vim600: sw=4 ts=4 syntax=php et
- * vim<600: sw=4 ts=4
- */
diff --git a/phpdotnet/phd/Options/Parser.php b/phpdotnet/phd/Options/Parser.php
index 206b509..a2934f9 100644
--- a/phpdotnet/phd/Options/Parser.php
+++ b/phpdotnet/phd/Options/Parser.php
@@ -115,7 +115,4 @@ class Options_Parser
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/PI/DBHTMLHandler.php b/phpdotnet/phd/PI/DBHTMLHandler.php
index 7eca27f..b7f47bc 100644
--- a/phpdotnet/phd/PI/DBHTMLHandler.php
+++ b/phpdotnet/phd/PI/DBHTMLHandler.php
@@ -112,7 +112,4 @@ class PI_DBHTMLHandler extends PIHandler {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/PI/PHPDOCHandler.php b/phpdotnet/phd/PI/PHPDOCHandler.php
index 2101cd0..b7d0631 100644
--- a/phpdotnet/phd/PI/PHPDOCHandler.php
+++ b/phpdotnet/phd/PI/PHPDOCHandler.php
@@ -160,7 +160,4 @@ class PI_PHPDOCHandler extends PIHandler {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/PIHandler.php b/phpdotnet/phd/PIHandler.php
index 20c24f9..dc1ed4c 100644
--- a/phpdotnet/phd/PIHandler.php
+++ b/phpdotnet/phd/PIHandler.php
@@ -12,7 +12,4 @@ abstract class PIHandler {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/BigXHTML.php b/phpdotnet/phd/Package/Generic/BigXHTML.php
index 16aa1e7..f9e5ade 100644
--- a/phpdotnet/phd/Package/Generic/BigXHTML.php
+++ b/phpdotnet/phd/Package/Generic/BigXHTML.php
@@ -114,7 +114,4 @@ HEADER;
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/ChunkedXHTML.php b/phpdotnet/phd/Package/Generic/ChunkedXHTML.php
index 6241249..fc67b88 100644
--- a/phpdotnet/phd/Package/Generic/ChunkedXHTML.php
+++ b/phpdotnet/phd/Package/Generic/ChunkedXHTML.php
@@ -208,7 +208,4 @@ ul.toc li a:hover {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/Factory.php b/phpdotnet/phd/Package/Generic/Factory.php
index 53893d1..87278a2 100644
--- a/phpdotnet/phd/Package/Generic/Factory.php
+++ b/phpdotnet/phd/Package/Generic/Factory.php
@@ -27,7 +27,4 @@ class Package_Generic_Factory extends Format_Factory
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/Manpage.php b/phpdotnet/phd/Package/Generic/Manpage.php
index 9d79233..1d32543 100644
--- a/phpdotnet/phd/Package/Generic/Manpage.php
+++ b/phpdotnet/phd/Package/Generic/Manpage.php
@@ -789,7 +789,4 @@ class Package_Generic_Manpage extends Format_Abstract_Manpage {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/PDF.php b/phpdotnet/phd/Package/Generic/PDF.php
index e3d319b..fdeb43c 100644
--- a/phpdotnet/phd/Package/Generic/PDF.php
+++ b/phpdotnet/phd/Package/Generic/PDF.php
@@ -1141,7 +1141,4 @@ abstract class Package_Generic_PDF extends Format_Abstract_PDF {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/TocFeed.php b/phpdotnet/phd/Package/Generic/TocFeed.php
index cb03912..ec3cd51 100644
--- a/phpdotnet/phd/Package/Generic/TocFeed.php
+++ b/phpdotnet/phd/Package/Generic/TocFeed.php
@@ -525,7 +525,4 @@ XML;
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/Generic/XHTML.php b/phpdotnet/phd/Package/Generic/XHTML.php
index 963e85c..fc99d22 100644
--- a/phpdotnet/phd/Package/Generic/XHTML.php
+++ b/phpdotnet/phd/Package/Generic/XHTML.php
@@ -2083,7 +2083,4 @@ abstract class Package_Generic_XHTML extends Format_Abstract_XHTML {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/API.php b/phpdotnet/phd/Package/IDE/API.php
index 6764f8a..8b4456a 100644
--- a/phpdotnet/phd/Package/IDE/API.php
+++ b/phpdotnet/phd/Package/IDE/API.php
@@ -150,8 +150,3 @@ class Package_IDE_API
         return $methods;
     }
 }
-
-/*
- * vim600: sw=4 ts=4 syntax=php et
- * vim<600: sw=4 ts=4
- */
diff --git a/phpdotnet/phd/Package/IDE/API/Function.php b/phpdotnet/phd/Package/IDE/API/Function.php
index b7de427..adec46e 100644
--- a/phpdotnet/phd/Package/IDE/API/Function.php
+++ b/phpdotnet/phd/Package/IDE/API/Function.php
@@ -302,8 +302,3 @@ class Package_IDE_API_Function
     }
 
 }
-
-/*
- * vim600: sw=4 ts=4 syntax=php et
- * vim<600: sw=4 ts=4
- */
diff --git a/phpdotnet/phd/Package/IDE/API/Param.php b/phpdotnet/phd/Package/IDE/API/Param.php
index 4b67f7f..ce34066 100644
--- a/phpdotnet/phd/Package/IDE/API/Param.php
+++ b/phpdotnet/phd/Package/IDE/API/Param.php
@@ -146,8 +146,3 @@ class Package_IDE_API_Param
     }
 
 }
-
-/*
- * vim600: sw=4 ts=4 syntax=php et
- * vim<600: sw=4 ts=4
- */
diff --git a/phpdotnet/phd/Package/IDE/Base.php b/phpdotnet/phd/Package/IDE/Base.php
index 0b23ba3..71138a9 100644
--- a/phpdotnet/phd/Package/IDE/Base.php
+++ b/phpdotnet/phd/Package/IDE/Base.php
@@ -455,7 +455,4 @@ abstract class Package_IDE_Base extends Format {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/Factory.php b/phpdotnet/phd/Package/IDE/Factory.php
index abbbda2..7b6519c 100644
--- a/phpdotnet/phd/Package/IDE/Factory.php
+++ b/phpdotnet/phd/Package/IDE/Factory.php
@@ -23,7 +23,4 @@ class Package_IDE_Factory extends Format_Factory {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/Funclist.php b/phpdotnet/phd/Package/IDE/Funclist.php
index 4a3cec0..63655c4 100644
--- a/phpdotnet/phd/Package/IDE/Funclist.php
+++ b/phpdotnet/phd/Package/IDE/Funclist.php
@@ -68,7 +68,4 @@ class Package_IDE_Funclist extends Format {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/JSON.php b/phpdotnet/phd/Package/IDE/JSON.php
index 024206c..bef5d06 100644
--- a/phpdotnet/phd/Package/IDE/JSON.php
+++ b/phpdotnet/phd/Package/IDE/JSON.php
@@ -14,7 +14,4 @@ class Package_IDE_JSON extends Package_IDE_Base {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/PHP.php b/phpdotnet/phd/Package/IDE/PHP.php
index 3a4a9a2..cbbc245 100644
--- a/phpdotnet/phd/Package/IDE/PHP.php
+++ b/phpdotnet/phd/Package/IDE/PHP.php
@@ -17,7 +17,4 @@ class Package_IDE_PHP extends Package_IDE_Base {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/PHPStub.php b/phpdotnet/phd/Package/IDE/PHPStub.php
index d00c053..f2ae051 100644
--- a/phpdotnet/phd/Package/IDE/PHPStub.php
+++ b/phpdotnet/phd/Package/IDE/PHPStub.php
@@ -81,7 +81,4 @@ EOD;
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/SQLite.php b/phpdotnet/phd/Package/IDE/SQLite.php
index 4a2e747..b12af89 100644
--- a/phpdotnet/phd/Package/IDE/SQLite.php
+++ b/phpdotnet/phd/Package/IDE/SQLite.php
@@ -148,7 +148,4 @@ SQL;
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/XML.php b/phpdotnet/phd/Package/IDE/XML.php
index 87f4325..e3ed75d 100644
--- a/phpdotnet/phd/Package/IDE/XML.php
+++ b/phpdotnet/phd/Package/IDE/XML.php
@@ -86,7 +86,4 @@ class Package_IDE_XML extends Package_IDE_Base {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/IDE/demo.php b/phpdotnet/phd/Package/IDE/demo.php
index 35786a5..91877ef 100644
--- a/phpdotnet/phd/Package/IDE/demo.php
+++ b/phpdotnet/phd/Package/IDE/demo.php
@@ -185,8 +185,3 @@ if ($OPTION['all'] === true || $OPTION['seealso'] === true) {
         echo "\tDescription: "  . $entry['description']     . PHP_EOL;
     }
 }
-
-/*
- * vim600: sw=4 ts=4 syntax=php et
- * vim<600: sw=4 ts=4
- */
diff --git a/phpdotnet/phd/Package/PEAR/BigXHTML.php b/phpdotnet/phd/Package/PEAR/BigXHTML.php
index f3de3d7..0acccdc 100755
--- a/phpdotnet/phd/Package/PEAR/BigXHTML.php
+++ b/phpdotnet/phd/Package/PEAR/BigXHTML.php
@@ -122,7 +122,4 @@ HEADER;
 }
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PEAR/CHM.php b/phpdotnet/phd/Package/PEAR/CHM.php
index b6fc58f..a93c1c0 100755
--- a/phpdotnet/phd/Package/PEAR/CHM.php
+++ b/phpdotnet/phd/Package/PEAR/CHM.php
@@ -425,7 +425,4 @@ $1</head>',
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
index 82fba7c..88d2dc6 100755
--- a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
+++ b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
@@ -202,7 +202,4 @@ NAV;
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PEAR/Factory.php b/phpdotnet/phd/Package/PEAR/Factory.php
index 2534e80..4b7c49d 100644
--- a/phpdotnet/phd/Package/PEAR/Factory.php
+++ b/phpdotnet/phd/Package/PEAR/Factory.php
@@ -22,7 +22,4 @@ class Package_PEAR_Factory extends Format_Factory {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PEAR/Web.php b/phpdotnet/phd/Package/PEAR/Web.php
index 8f048da..0217cbd 100755
--- a/phpdotnet/phd/Package/PEAR/Web.php
+++ b/phpdotnet/phd/Package/PEAR/Web.php
@@ -135,7 +135,4 @@ manualHeader("index.php"'
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PEAR/XHTML.php b/phpdotnet/phd/Package/PEAR/XHTML.php
index 081aabe..5aaf337 100755
--- a/phpdotnet/phd/Package/PEAR/XHTML.php
+++ b/phpdotnet/phd/Package/PEAR/XHTML.php
@@ -1141,7 +1141,4 @@ abstract class Package_PEAR_XHTML extends Package_Generic_XHTML {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/BigPDF.php b/phpdotnet/phd/Package/PHP/BigPDF.php
index 54469f5..af6b451 100644
--- a/phpdotnet/phd/Package/PHP/BigPDF.php
+++ b/phpdotnet/phd/Package/PHP/BigPDF.php
@@ -74,7 +74,4 @@ class Package_PHP_BigPDF extends Package_PHP_PDF {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/BigXHTML.php b/phpdotnet/phd/Package/PHP/BigXHTML.php
index 89662fa..33c5eae 100644
--- a/phpdotnet/phd/Package/PHP/BigXHTML.php
+++ b/phpdotnet/phd/Package/PHP/BigXHTML.php
@@ -118,7 +118,4 @@ HEADER;
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/CHM.php b/phpdotnet/phd/Package/PHP/CHM.php
index 36692bf..61fdd55 100644
--- a/phpdotnet/phd/Package/PHP/CHM.php
+++ b/phpdotnet/phd/Package/PHP/CHM.php
@@ -447,7 +447,4 @@ res' . DIRECTORY_SEPARATOR . 'style.css
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/ChunkedXHTML.php b/phpdotnet/phd/Package/PHP/ChunkedXHTML.php
index a04d83d..1dc7bd7 100644
--- a/phpdotnet/phd/Package/PHP/ChunkedXHTML.php
+++ b/phpdotnet/phd/Package/PHP/ChunkedXHTML.php
@@ -90,7 +90,4 @@ NAV;
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/Epub.php b/phpdotnet/phd/Package/PHP/Epub.php
index d2917b2..832232d 100644
--- a/phpdotnet/phd/Package/PHP/Epub.php
+++ b/phpdotnet/phd/Package/PHP/Epub.php
@@ -324,7 +324,4 @@ XHTML;
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/Factory.php b/phpdotnet/phd/Package/PHP/Factory.php
index 6b61f1d..57e968f 100644
--- a/phpdotnet/phd/Package/PHP/Factory.php
+++ b/phpdotnet/phd/Package/PHP/Factory.php
@@ -29,7 +29,4 @@ class Package_PHP_Factory extends Format_Factory {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/HowTo.php b/phpdotnet/phd/Package/PHP/HowTo.php
index 4648d94..cb274a2 100644
--- a/phpdotnet/phd/Package/PHP/HowTo.php
+++ b/phpdotnet/phd/Package/PHP/HowTo.php
@@ -87,7 +87,4 @@ NAV;
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/KDevelop.php b/phpdotnet/phd/Package/PHP/KDevelop.php
index 7812cbf..5d3c652 100644
--- a/phpdotnet/phd/Package/PHP/KDevelop.php
+++ b/phpdotnet/phd/Package/PHP/KDevelop.php
@@ -168,7 +168,4 @@ class Package_PHP_KDevelop extends Format {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/Manpage.php b/phpdotnet/phd/Package/PHP/Manpage.php
index 4db9cf9..1408ad8 100644
--- a/phpdotnet/phd/Package/PHP/Manpage.php
+++ b/phpdotnet/phd/Package/PHP/Manpage.php
@@ -101,7 +101,4 @@ class Package_PHP_Manpage extends Package_Generic_Manpage {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/PDF.php b/phpdotnet/phd/Package/PHP/PDF.php
index 9aab274..8bd48f1 100644
--- a/phpdotnet/phd/Package/PHP/PDF.php
+++ b/phpdotnet/phd/Package/PHP/PDF.php
@@ -321,7 +321,4 @@ class Package_PHP_PDF extends Package_Generic_PDF {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/Web.php b/phpdotnet/phd/Package/PHP/Web.php
index 126d2b9..14b6718 100644
--- a/phpdotnet/phd/Package/PHP/Web.php
+++ b/phpdotnet/phd/Package/PHP/Web.php
@@ -270,7 +270,4 @@ manual_setup($setup);
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Package/PHP/XHTML.php b/phpdotnet/phd/Package/PHP/XHTML.php
index c5da19c..cf96c73 100644
--- a/phpdotnet/phd/Package/PHP/XHTML.php
+++ b/phpdotnet/phd/Package/PHP/XHTML.php
@@ -926,7 +926,4 @@ abstract class Package_PHP_XHTML extends Package_Generic_XHTML {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Reader.php b/phpdotnet/phd/Reader.php
index 1e17c41..61560ca 100644
--- a/phpdotnet/phd/Reader.php
+++ b/phpdotnet/phd/Reader.php
@@ -43,7 +43,4 @@ class Reader extends \XMLReader
 }
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Reader/Partial.php b/phpdotnet/phd/Reader/Partial.php
index 0c8cda3..4a16f70 100644
--- a/phpdotnet/phd/Reader/Partial.php
+++ b/phpdotnet/phd/Reader/Partial.php
@@ -126,8 +126,3 @@ class Reader_Partial extends Reader
         return $ret;
     }
 }
-
-/*
-* vim600: sw=4 ts=4 fdm=syntax syntax=php et
-* vim<600: sw=4 ts=4
-*/
diff --git a/phpdotnet/phd/ReaderKeeper.php b/phpdotnet/phd/ReaderKeeper.php
index b4107f9..f1a1bb3 100644
--- a/phpdotnet/phd/ReaderKeeper.php
+++ b/phpdotnet/phd/ReaderKeeper.php
@@ -44,7 +44,4 @@ class ReaderKeeper
 }
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/Render.php b/phpdotnet/phd/Render.php
index 33eeb55..337009d 100644
--- a/phpdotnet/phd/Render.php
+++ b/phpdotnet/phd/Render.php
@@ -234,7 +234,4 @@ class Render extends ObjectStorage
 }
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/phpdotnet/phd/functions.php b/phpdotnet/phd/functions.php
index 5c620d8..0d443f1 100644
--- a/phpdotnet/phd/functions.php
+++ b/phpdotnet/phd/functions.php
@@ -182,7 +182,4 @@ function errh($errno, $msg, $file, $line, $ctx = null) {
 set_error_handler(__NAMESPACE__ . '\\errh');
 /* }}} */
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/render.php b/render.php
index 67d8bd8..4cf6696 100644
--- a/render.php
+++ b/render.php
@@ -123,7 +123,4 @@ $render->execute($reader);
 v("Finished rendering", VERBOSE_FORMAT_RENDERING);
 
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/tests/TestRender.php b/tests/TestRender.php
index cfbd4b7..0fd8dea 100644
--- a/tests/TestRender.php
+++ b/tests/TestRender.php
@@ -32,7 +32,4 @@ class TestRender {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/tests/php/TestBigXHTML.php b/tests/php/TestBigXHTML.php
index bae3950..ce0eec5 100644
--- a/tests/php/TestBigXHTML.php
+++ b/tests/php/TestBigXHTML.php
@@ -41,7 +41,4 @@ class TestBigXHTML extends Package_PHP_BigXHTML {
 
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/tests/php/TestChunkedXHTML.php b/tests/php/TestChunkedXHTML.php
index c10a1e7..e3dc16e 100644
--- a/tests/php/TestChunkedXHTML.php
+++ b/tests/php/TestChunkedXHTML.php
@@ -33,7 +33,4 @@ class TestChunkedXHTML extends Package_PHP_ChunkedXHTML {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/tests/setup.php b/tests/setup.php
index 78d0bd6..b561200 100644
--- a/tests/setup.php
+++ b/tests/setup.php
@@ -20,7 +20,4 @@ Config::init([
     "package_dirs" => [__PHDDIR__, __INSTALLDIR__],
 ]);
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+
diff --git a/tests/xhtml/TestChunkedXHTML.php b/tests/xhtml/TestChunkedXHTML.php
index b41ba74..21badb2 100644
--- a/tests/xhtml/TestChunkedXHTML.php
+++ b/tests/xhtml/TestChunkedXHTML.php
@@ -33,7 +33,4 @@ class TestChunkedXHTML extends Package_Generic_ChunkedXHTML {
     }
 }
 
-/*
-* vim600: sw=4 ts=4 syntax=php et
-* vim<600: sw=4 ts=4
-*/
+