diff --git a/src/Alphabar.php b/src/Alphabar.php
index 00203f1..3f4566b 100644
--- a/src/Alphabar.php
+++ b/src/Alphabar.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains Alphabar.
- */
-
 namespace Drupal\g2;
 
 use Drupal\Component\Utility\Unicode;
diff --git a/src/Controller/Feed.php b/src/Controller/Feed.php
index 149478e..51b6409 100644
--- a/src/Controller/Feed.php
+++ b/src/Controller/Feed.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * @file
- * Contains the G2 Feed controller.
- *
- * @copyright 2005-2015 Frédéric G. Marand, for Ouest Systemes Informatiques.
- */
 
 namespace Drupal\g2\Controller;
 
diff --git a/src/Controller/Homonyms.php b/src/Controller/Homonyms.php
index 528dcb5..d8609d6 100644
--- a/src/Controller/Homonyms.php
+++ b/src/Controller/Homonyms.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains G2 homonyms controller.
- */
-
 namespace Drupal\g2\Controller;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
diff --git a/src/Controller/Initial.php b/src/Controller/Initial.php
index 106458d..d18b9d8 100644
--- a/src/Controller/Initial.php
+++ b/src/Controller/Initial.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the G2 entries-by-initial page controller.
- */
-
 namespace Drupal\g2\Controller;
 
 
diff --git a/src/Controller/Main.php b/src/Controller/Main.php
index 581397a..c7d1aae 100644
--- a/src/Controller/Main.php
+++ b/src/Controller/Main.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the G2 Main page controller.
- */
-
 namespace Drupal\g2\Controller;
 
 use Drupal\Core\Config\ImmutableConfig;
diff --git a/src/Form/RefererWipe.php b/src/Form/RefererWipe.php
index 6ba0705..e5e1ca4 100644
--- a/src/Form/RefererWipe.php
+++ b/src/Form/RefererWipe.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the Referer Wipe form.
- */
-
 namespace Drupal\g2;
 
 /**
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index 110eaec..07a05c4 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the G2 settings form.
- */
-
 namespace Drupal\g2\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
diff --git a/src/G2.php b/src/G2.php
index 52b7267..f561d8a 100644
--- a/src/G2.php
+++ b/src/G2.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains G2.
- *
- * @copyright 2005-2015 Frédéric G. Marand, for Ouest Systemes Informatiques.
- */
-
 namespace Drupal\g2;
 
 /**
diff --git a/src/Latest.php b/src/Latest.php
index fe4144e..79fd79d 100644
--- a/src/Latest.php
+++ b/src/Latest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains G2 Latest service.
- */
-
 namespace Drupal\g2;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
diff --git a/src/ParamConverter/NodeMatch.php b/src/ParamConverter/NodeMatch.php
index 7f62be7..27cf9c1 100644
--- a/src/ParamConverter/NodeMatch.php
+++ b/src/ParamConverter/NodeMatch.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the G2 Node ParamConverter.
- */
-
 namespace Drupal\g2\ParamConverter;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
diff --git a/src/Plugin/Block/AlphabarBlock.php b/src/Plugin/Block/AlphabarBlock.php
index 29f81e8..1f4ddaf 100644
--- a/src/Plugin/Block/AlphabarBlock.php
+++ b/src/Plugin/Block/AlphabarBlock.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the Alphabar block plugin.
- */
-
 namespace Drupal\g2\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
diff --git a/src/Plugin/Block/LatestBlock.php b/src/Plugin/Block/LatestBlock.php
index fe7ab27..c84d98c 100644
--- a/src/Plugin/Block/LatestBlock.php
+++ b/src/Plugin/Block/LatestBlock.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the Latest(n) block plugin.
- */
-
 namespace Drupal\g2\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
diff --git a/src/Plugin/Block/Random.php b/src/Plugin/Block/Random.php
index 1ffa1ae..31caff0 100644
--- a/src/Plugin/Block/Random.php
+++ b/src/Plugin/Block/Random.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the G2 Random block plugin.
- *
- * @copyright 2005-2015 Frédéric G. Marand, for Ouest Systemes Informatiques.
- */
-
 namespace Drupal\g2\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
diff --git a/src/Plugin/Block/TopBlock.php b/src/Plugin/Block/TopBlock.php
index 1d763a4..ecace02 100644
--- a/src/Plugin/Block/TopBlock.php
+++ b/src/Plugin/Block/TopBlock.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the Top(n) block plugin.
- */
-
 namespace Drupal\g2\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
diff --git a/src/Plugin/Block/Wotd.php b/src/Plugin/Block/Wotd.php
index 39116d2..af610df 100644
--- a/src/Plugin/Block/Wotd.php
+++ b/src/Plugin/Block/Wotd.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains the G2 Word of the Day block plugin.
- *
- * @copyright 2005-2015 Frédéric G. Marand, for Ouest Systemes Informatiques.
- */
-
 namespace Drupal\g2\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
diff --git a/src/Requirements.php b/src/Requirements.php
index d4dd991..e010761 100644
--- a/src/Requirements.php
+++ b/src/Requirements.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains G2 Requirements.
- *
- * @copyright 2005-2015 Frédéric G. Marand, for Ouest Systemes Informatiques.
- */
-
 namespace Drupal\g2;
 
 
diff --git a/src/Tests/AlphabarTest.php b/src/Tests/AlphabarTest.php
index 3e3467b..45b5bea 100644
--- a/src/Tests/AlphabarTest.php
+++ b/src/Tests/AlphabarTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains AlphabarTest.
- */
 
 namespace Drupal\g2\Tests;
 
diff --git a/src/Tests/G2UnitTest.php b/src/Tests/G2UnitTest.php
index 417ff5b..90df1aa 100644
--- a/src/Tests/G2UnitTest.php
+++ b/src/Tests/G2UnitTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains G2UnitTest.
- */
-
 namespace Drupal\g2\Tests;
 
 use Drupal\g2\G2;
diff --git a/src/Top.php b/src/Top.php
index 298ca41..17e3698 100644
--- a/src/Top.php
+++ b/src/Top.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains G2 Top service.
- */
-
 namespace Drupal\g2;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
diff --git a/src/TopRecord.php b/src/TopRecord.php
index 8b8f21c..6818bb5 100644
--- a/src/TopRecord.php
+++ b/src/TopRecord.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contain Top(n) record type.
- */
-
 namespace Drupal\g2;
 
 /**