diff --git a/Classes/Controller/TeaController.php b/Classes/Controller/TeaController.php
index 0467287..7170f26 100644
--- a/Classes/Controller/TeaController.php
+++ b/Classes/Controller/TeaController.php
@@ -10,8 +10,6 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 /**
  * Controller for the main "Tea" FE plugin.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class TeaController extends ActionController
 {
diff --git a/Classes/Domain/Model/Product/Tea.php b/Classes/Domain/Model/Product/Tea.php
index 48804b6..810520e 100644
--- a/Classes/Domain/Model/Product/Tea.php
+++ b/Classes/Domain/Model/Product/Tea.php
@@ -11,8 +11,6 @@ use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
 
 /**
  * This class represents a tea (flavor), e.g., "Earl Grey".
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class Tea extends AbstractEntity
 {
diff --git a/Classes/Domain/Repository/Product/TeaRepository.php b/Classes/Domain/Repository/Product/TeaRepository.php
index 7414853..e8b436f 100644
--- a/Classes/Domain/Repository/Product/TeaRepository.php
+++ b/Classes/Domain/Repository/Product/TeaRepository.php
@@ -10,8 +10,6 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
 
 /**
  * Repository for Tea models.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class TeaRepository extends Repository
 {
diff --git a/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php b/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
index 2f879b8..4f36b25 100644
--- a/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
+++ b/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
@@ -11,8 +11,6 @@ use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
  * This trait for repositories makes the repository ignore the storage page setting when fetching models.
  *
  * @property ObjectManagerInterface $objectManager
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 trait StoragePageAgnosticTrait
 {
diff --git a/Tests/Acceptance/StarterCest.php b/Tests/Acceptance/StarterCest.php
index d6e67a0..11ab7ec 100644
--- a/Tests/Acceptance/StarterCest.php
+++ b/Tests/Acceptance/StarterCest.php
@@ -6,8 +6,6 @@ namespace TTN\Tea\Tests\Acceptance;
 
 /**
  * Test case.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class StarterCest
 {
diff --git a/Tests/Functional/Controller/TeaControllerTest.php b/Tests/Functional/Controller/TeaControllerTest.php
index 86dac93..3390a4c 100644
--- a/Tests/Functional/Controller/TeaControllerTest.php
+++ b/Tests/Functional/Controller/TeaControllerTest.php
@@ -9,8 +9,6 @@ use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 /**
  * Test case.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class TeaControllerTest extends FunctionalTestCase
 {
diff --git a/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
index f91f28c..d5ce539 100644
--- a/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
+++ b/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
@@ -14,8 +14,6 @@ use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 /**
  * Test case.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class TeaRepositoryTest extends FunctionalTestCase
 {
diff --git a/Tests/Unit/Controller/TeaControllerTest.php b/Tests/Unit/Controller/TeaControllerTest.php
index 674a043..06a90af 100644
--- a/Tests/Unit/Controller/TeaControllerTest.php
+++ b/Tests/Unit/Controller/TeaControllerTest.php
@@ -16,8 +16,6 @@ use TYPO3\CMS\Fluid\View\TemplateView;
 
 /**
  * Test case.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class TeaControllerTest extends UnitTestCase
 {
diff --git a/Tests/Unit/Domain/Model/Product/TeaTest.php b/Tests/Unit/Domain/Model/Product/TeaTest.php
index c7377bb..9c10a07 100644
--- a/Tests/Unit/Domain/Model/Product/TeaTest.php
+++ b/Tests/Unit/Domain/Model/Product/TeaTest.php
@@ -11,8 +11,6 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
 /**
  * Test case.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class TeaTest extends UnitTestCase
 {
diff --git a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
index 359f453..4bae701 100644
--- a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
@@ -12,8 +12,6 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
 
 /**
  * Test case.
- *
- * @author Oliver Klee <typo3-coding@oliverklee.de
  */
 class TeaRepositoryTest extends UnitTestCase
 {