diff --git a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
index c097edfd8af65..42ca68177cb83 100644
--- a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
+++ b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
@@ -10,7 +10,6 @@
  * Toolbar entry that shows latest notifications
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class ToolbarEntry extends \Magento\Backend\Block\Template
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index b99a8bbbc9031..ac1e631cc3f33 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -12,7 +12,6 @@
 /**
  * AdminNotification Feed model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/AdminNotification/Model/InboxInterface.php b/app/code/Magento/AdminNotification/Model/InboxInterface.php
index 4e87822763fc3..5e61c3dd680c9 100644
--- a/app/code/Magento/AdminNotification/Model/InboxInterface.php
+++ b/app/code/Magento/AdminNotification/Model/InboxInterface.php
@@ -8,7 +8,6 @@
 /**
  * AdminNotification Inbox interface
  *
- * @author Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/AdminNotification/Model/NotificationService.php b/app/code/Magento/AdminNotification/Model/NotificationService.php
index d44e98aaf2203..a13efe2136a6f 100644
--- a/app/code/Magento/AdminNotification/Model/NotificationService.php
+++ b/app/code/Magento/AdminNotification/Model/NotificationService.php
@@ -8,7 +8,6 @@
 /**
  * Notification service model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
index e12419155d52b..1a59d15e40c7a 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
@@ -6,8 +6,6 @@
 
 /**
  * AdminNotification Inbox model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
index 44ec765b9d0a2..bf4f91cc6ae80 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
@@ -9,8 +9,6 @@
  * AdminNotification Inbox model
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
- * @api
  * @since 100.0.2
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
index b9e77f8a35295..9504c2f2d10f7 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
@@ -6,8 +6,6 @@
 
 /**
  * Collection of unread notifications
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 24ef712c0f61f..a244ad1fb9a0f 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -9,8 +9,7 @@
 
 /**
  * AdminNotification observer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class PredispatchAdminActionControllerObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
index 403a4d12cc17b..401e9d666103e 100644
--- a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
@@ -9,7 +9,6 @@
  * Search queries relations grid container
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Edit extends \Magento\Backend\Block\Widget\Grid\Container
diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
index 6bdfd3b0dd143..add3e244be851 100644
--- a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
@@ -9,7 +9,6 @@
  * Search query relations edit grid
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
index c19c1d67d81f7..9be5d0c201841 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
@@ -8,7 +8,6 @@
 /**
  * Catalog search recommendations resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
index 85fee62eb4303..4ea6b6bcfde9a 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -14,8 +12,6 @@
 
 /**
  * Abstract action reindex class
- *
- * @package Magento\CatalogInventory\Model\Indexer\Stock
  */
 abstract class AbstractAction
 {
@@ -283,6 +279,8 @@ private function doReindex($productIds = [])
     }
 
     /**
+     * Get cache cleaner object
+     *
      * @return CacheCleaner
      */
     private function getCacheCleaner()
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
index c7dfcffee3d31..9e5e39e4aeb53 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,8 +8,6 @@
 
 /**
  * Class Row reindex action
- *
- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  */
 class Row extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
index f107955f0201e..a6176df3b107e 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,8 +8,6 @@
 
 /**
  * Class Rows reindex action for mass actions
- *
- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  */
 class Rows extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
index f1cef90fc68ca..005ffd11ac7a1 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
index 403f64e7f77f8..73c4a8833e433 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,7 +9,7 @@
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
     /**
-     * Indexer ID
+     * Get Indexer ID for cataloginventory_stock
      */
     const INDEXER_ID = 'cataloginventory_stock';
 }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
index ca89ac01f280f..c888d522d2e8b 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
index 25b0c2ef33ebe..c9f60bd61c2fb 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
index e01f371b829d6..42d578ec88ea8 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
index 0e2b6b2f329c1..a81a4cd34b87f 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index e4b12c30e71b4..d70df80038193 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_Sales
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */